embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(@embark/test_app): Fix tests as paths have chagned 

The latest lerna changes have changed the HTTP paths of some test files used in the repo. This PR updates the paths to their new location.
This commit is contained in:
emizzle 2019-02-05 09:46:34 +11:00 committed by Michael Bradley
parent 7a93e4b6a7
commit 0ba16278bd
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/embark/src/test/config.js
View File

@ -178,7 +178,7 @@ describe('embark.Config', function () {
config.contractsFiles = [];
config.contractsConfig.contracts = [
{
file: 'https://github.com/embark-framework/embark/blob/master/test_app/app/contracts/simple_storage.sol'
file: 'https://github.com/embark-framework/embark/master/test_dapps/packages/test_app/app/contracts/simple_storage.sol'
},
{
file: 'github.com/status-im/contracts/contracts/identity/ERC725.sol'
@ -190,8 +190,8 @@ describe('embark.Config', function () {
const expected = [
{
"type": "http",
"externalUrl": "https://raw.githubusercontent.com/embark-framework/embark/master/test_app/app/contracts/simple_storage.sol",
"path": ".embark/contracts/embark-framework/embark/master/test_app/app/contracts/simple_storage.sol",
"externalUrl": "https://raw.githubusercontent.com/embark-framework/embark/master/test_dapps/packages/test_app/app/contracts/simple_storage.sol",
"path": ".embark/contracts/embark-framework/embark/master/test_dapps/packages/test_app/app/contracts/simple_storage.sol",
"pluginPath": '',
"basedir": "",
"importRemappings": [],

2
packages/embark/src/test/contracts/contract_with_http_import.sol
View File

@ -1,5 +1,5 @@
pragma solidity ^0.5.0;
import "https://github.com/embark-framework/embark/blob/master/test_apps/contracts_app/contracts/contract_args.sol";
import "https://github.com/embark-framework/embark/blob/master/test_dapps/packages/test_apps/contracts_app/contracts/contract_args.sol";
contract SimpleStorage {
uint public storedData;

14
packages/embark/src/test/utils.js
View File

@ -7,18 +7,18 @@ describe('embark.utils', function () {
describe('#getExternalContractUrl', function () {
it('should get the right url for a https://github file', function () {
const fileObj = Utils.getExternalContractUrl(
'https://github.com/embark-framework/embark/blob/master/test_app/app/contracts/simple_storage.sol'
'https://github.com/embark-framework/embark/blob/master/test_dapps/packages/test_app/app/contracts/simple_storage.sol'
);
assert.deepEqual(fileObj,
{
filePath: constants.httpContractsDirectory + 'embark-framework/embark/master/test_app/app/contracts/simple_storage.sol',
url: 'https://raw.githubusercontent.com/embark-framework/embark/master/test_app/app/contracts/simple_storage.sol'
filePath: constants.httpContractsDirectory + 'embark-framework/embark/master/test_dapps/packages/test_app/app/contracts/simple_storage.sol',
url: 'https://raw.githubusercontent.com/embark-framework/embark/master/test_dapps/packages/test_app/app/contracts/simple_storage.sol'
});
});
it('should fail for a malformed https://github file', function () {
const fileObj = Utils.getExternalContractUrl(
'https://github/embark-framework/embark/blob/master/test_app/app/contracts/simple_storage.sol'
'https://github/embark-framework/embark/blob/master/test_dapps/packages/test_app/app/contracts/simple_storage.sol'
);
assert.strictEqual(fileObj, null);
});
@ -92,7 +92,7 @@ describe('embark.utils', function () {
});
it('should get the correct default url for a correct bzz:/ swarm file', function () {
const swarmFile = 'bzz:/someensdomain.eth/ERC725.sol'
const swarmFile = 'bzz:/someensdomain.eth/ERC725.sol';
const fileObj = Utils.getExternalContractUrl(
swarmFile
);
@ -103,7 +103,7 @@ describe('embark.utils', function () {
});
it('should get the correct url for a correct bzz:/ swarm file when a http swarm gateway is explicitly provided', function () {
const swarmFile = 'bzz:/someensdomain.eth/ERC725.sol'
const swarmFile = 'bzz:/someensdomain.eth/ERC725.sol';
const fileObj = Utils.getExternalContractUrl(
swarmFile,
'http://localhost:8500'
@ -115,7 +115,7 @@ describe('embark.utils', function () {
});
it('should get the correct url for a correct bzz:/ swarm file when a https swarm gateway is provided', function () {
const swarmFile = 'bzz:/1ffe993abc835f480f688d07ad75ad1dbdbd1ddb368a08b7ed4d3e400771dd63'
const swarmFile = 'bzz:/1ffe993abc835f480f688d07ad75ad1dbdbd1ddb368a08b7ed4d3e400771dd63';
const fileObj = Utils.getExternalContractUrl(
swarmFile,
'https://swarm-gateways.net'

4
test_dapps/packages/test_app/app/contracts/SimpleStorageWithHttpImport.sol
View File

@ -1,7 +1,7 @@
pragma solidity ^0.4.17;
import "https://github.com/embark-framework/embark/blob/master/test_apps/contracts_app/contracts/ownable.sol";
import "https://github.com/embark-framework/embark/blob/master/test_apps/contracts_app/contracts/contract_args.sol";
import "https://github.com/embark-framework/embark/blob/master/test_dapps/packages/contracts_app/contracts/ownable.sol";
import "https://github.com/embark-framework/embark/blob/master/test_dapps/packages/contracts_app/contracts/contract_args.sol";
contract SimpleStorageWithHttpImport is Ownable {

2
test_dapps/packages/test_app/test/http_contract_test.js
View File

@ -24,7 +24,7 @@ describe('http contracts', () => {
});
it('should have downloaded the http import in SimpleStorageWithHttpImport', (done) => {
const contractImportPath = '.embark/contracts/embark-framework/embark/master/test_apps/contracts_app/contracts/ownable.sol';
const contractImportPath = '.embark/contracts/embark-framework/embark/master/test_dapps/packages/contracts_app/contracts/ownable.sol';
fs.access(contractImportPath, (err) => {
if (err) {
assert.fail(contractImportPath + ' was not downloaded');