From 07ede9017e1f895a8fdca266c3f10ed577e39869 Mon Sep 17 00:00:00 2001 From: emizzle Date: Wed, 13 Feb 2019 09:40:41 +1100 Subject: [PATCH] fix(@embark/core): fix tests as paths have changed again URLs for test_app files have changed on the remote again, this PR updates the tests to reflect that change. --- packages/embark/src/test/config.js | 8 ++++---- .../src/test/contracts/contract_with_http_import.sol | 2 +- packages/embark/src/test/utils.js | 8 ++++---- .../app/contracts/SimpleStorageWithHttpImport.sol | 4 ++-- test_dapps/test_app/test/http_contract_test.js | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/embark/src/test/config.js b/packages/embark/src/test/config.js index 50b91d3d4..fb25051fa 100644 --- a/packages/embark/src/test/config.js +++ b/packages/embark/src/test/config.js @@ -178,7 +178,7 @@ describe('embark.Config', function () { config.contractsFiles = []; config.contractsConfig.contracts = [ { - file: 'https://github.com/embark-framework/embark/master/test_dapps/packages/test_app/app/contracts/simple_storage.sol' + file: 'https://github.com/embark-framework/embark/master/test_dapps/test_app/app/contracts/simple_storage.sol' }, { file: 'github.com/status-im/contracts/contracts/identity/ERC725.sol' @@ -190,9 +190,9 @@ describe('embark.Config', function () { const expected = [ { "type": "http", - "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", - "originalPath": ".embark/contracts/embark-framework/embark/master/test_dapps/packages/test_app/app/contracts/simple_storage.sol", + "externalUrl": "https://raw.githubusercontent.com/embark-framework/embark/master/test_dapps/test_app/app/contracts/simple_storage.sol", + "path": ".embark/contracts/embark-framework/embark/master/test_dapps/test_app/app/contracts/simple_storage.sol", + "originalPath": ".embark/contracts/embark-framework/embark/master/test_dapps/test_app/app/contracts/simple_storage.sol", "pluginPath": '', "basedir": "", "importRemappings": [], diff --git a/packages/embark/src/test/contracts/contract_with_http_import.sol b/packages/embark/src/test/contracts/contract_with_http_import.sol index 5a66c8ebb..10f50b49f 100644 --- a/packages/embark/src/test/contracts/contract_with_http_import.sol +++ b/packages/embark/src/test/contracts/contract_with_http_import.sol @@ -1,5 +1,5 @@ pragma solidity ^0.5.0; -import "https://github.com/embark-framework/embark/blob/master/test_dapps/packages/test_apps/contracts_app/contracts/contract_args.sol"; +import "https://github.com/embark-framework/embark/blob/master/test_dapps/test_apps/contracts_app/contracts/contract_args.sol"; contract SimpleStorage { uint public storedData; diff --git a/packages/embark/src/test/utils.js b/packages/embark/src/test/utils.js index 5ac29cd2f..72420571e 100644 --- a/packages/embark/src/test/utils.js +++ b/packages/embark/src/test/utils.js @@ -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_dapps/packages/test_app/app/contracts/simple_storage.sol' + 'https://github.com/embark-framework/embark/blob/master/test_dapps/test_app/app/contracts/simple_storage.sol' ); assert.deepEqual(fileObj, { - 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' + filePath: constants.httpContractsDirectory + 'embark-framework/embark/master/test_dapps/test_app/app/contracts/simple_storage.sol', + url: 'https://raw.githubusercontent.com/embark-framework/embark/master/test_dapps/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_dapps/packages/test_app/app/contracts/simple_storage.sol' + 'https://github/embark-framework/embark/blob/master/test_dapps/test_app/app/contracts/simple_storage.sol' ); assert.strictEqual(fileObj, null); }); diff --git a/test_dapps/test_app/app/contracts/SimpleStorageWithHttpImport.sol b/test_dapps/test_app/app/contracts/SimpleStorageWithHttpImport.sol index 7fa58399b..91ec86e3d 100644 --- a/test_dapps/test_app/app/contracts/SimpleStorageWithHttpImport.sol +++ b/test_dapps/test_app/app/contracts/SimpleStorageWithHttpImport.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.17; -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"; +import "https://github.com/embark-framework/embark/blob/master/test_dapps/contracts_app/contracts/ownable.sol"; +import "https://github.com/embark-framework/embark/blob/master/test_dapps/contracts_app/contracts/contract_args.sol"; contract SimpleStorageWithHttpImport is Ownable { diff --git a/test_dapps/test_app/test/http_contract_test.js b/test_dapps/test_app/test/http_contract_test.js index ac4e3c6fe..2f9ce43ce 100644 --- a/test_dapps/test_app/test/http_contract_test.js +++ b/test_dapps/test_app/test/http_contract_test.js @@ -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_dapps/packages/contracts_app/contracts/ownable.sol'; + const contractImportPath = '.embark/contracts/embark-framework/embark/master/test_dapps/contracts_app/contracts/ownable.sol'; fs.access(contractImportPath, (err) => { if (err) { assert.fail(contractImportPath + ' was not downloaded');