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

fix: revise test urls to reflect test_dapps/ -> dapps/tests/

This commit is contained in:
Michael Bradley, Jr 2019-03-05 10:50:25 -06:00 committed by Michael Bradley
parent 73a06725ac
commit eb1b6933af
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dapps/tests/app/app/contracts/SimpleStorageWithHttpImport.sol
View File

@ -1,8 +1,7 @@
pragma solidity ^0.4.17;
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";
import "https://github.com/embark-framework/embark/blob/master/dapps/tests/contracts/contracts/ownable.sol";
import "https://github.com/embark-framework/embark/blob/master/dapps/tests/contracts/contracts/contract_args.sol";
contract SimpleStorageWithHttpImport is Ownable {
uint public storedData;

2
dapps/tests/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_dapps/contracts_app/contracts/ownable.sol';
const contractImportPath = '.embark/contracts/embark-framework/embark/master/dapps/tests/contracts/contracts/ownable.sol';
fs.access(contractImportPath, (err) => {
if (err) {
assert.fail(contractImportPath + ' was not downloaded');

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

@ -179,7 +179,7 @@ describe('embark.Config', function () {
config.contractsFiles = [];
config.contractsConfig.contracts = [
{
file: 'https://github.com/embark-framework/embark/master/test_dapps/test_app/app/contracts/simple_storage.sol'
file: 'https://github.com/embark-framework/embark/blob/master/dapps/templates/demo/contracts/simple_storage.sol'
},
{
file: 'github.com/status-im/contracts/contracts/identity/ERC725.sol'
@ -191,9 +191,9 @@ describe('embark.Config', function () {
const expected = [
{
"type": "http",
"externalUrl": "https://raw.githubusercontent.com/embark-framework/embark/master/test_dapps/test_app/app/contracts/simple_storage.sol",
"path": fs.dappPath(".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",
"externalUrl": "https://raw.githubusercontent.com/embark-framework/embark/master/dapps/templates/demo/contracts/simple_storage.sol",
"path": fs.dappPath(".embark/contracts/embark-framework/embark/master/dapps/templates/demo/contracts/simple_storage.sol"),
"originalPath": ".embark/contracts/embark-framework/embark/master/dapps/templates/demo/contracts/simple_storage.sol",
"pluginPath": '',
"basedir": "",
"importRemappings": [],

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

@ -1,5 +1,7 @@
pragma solidity ^0.5.0;
import "https://github.com/embark-framework/embark/blob/master/test_dapps/test_apps/contracts_app/contracts/contract_args.sol";
import "https://github.com/embark-framework/embark/blob/master/dapps/tests/contracts/contracts/contract_args.sol";
contract SimpleStorage {
uint public storedData;
@ -16,4 +18,3 @@ contract SimpleStorage {
}
}

2
packages/embark/src/test/file.js
View File

@ -6,7 +6,7 @@ const fs = require("../lib/core/fs");
describe('embark.File', function () {
describe('Read file contents', function () {
it('should be able to download a file when type is "http"', async () => {
const file = new File({externalUrl: 'https://raw.githubusercontent.com/embark-framework/embark/master/test_dapps/test_app/app/contracts/simple_storage.sol', type: Types.http});
const file = new File({externalUrl: 'https://raw.githubusercontent.com/embark-framework/embark/master/dapps/tests/app/app/contracts/simple_storage.sol', type: Types.http});
const content = await file.content;
expect(content).to.be.ok; //eslint-disable-line

8
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_dapps/test_app/app/contracts/simple_storage.sol'
'https://github.com/embark-framework/embark/blob/master/dapps/templates/demo/contracts/simple_storage.sol'
);
assert.deepEqual(fileObj,
{
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'
filePath: constants.httpContractsDirectory + 'embark-framework/embark/master/dapps/templates/demo/contracts/simple_storage.sol',
url: 'https://raw.githubusercontent.com/embark-framework/embark/master/dapps/templates/demo/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/test_app/app/contracts/simple_storage.sol'
'https://github/embark-framework/embark/blob/master/dapps/templates/demo/contracts/simple_storage.sol'
);
assert.strictEqual(fileObj, null);
});