change another storage test

lib/tests/test.js

@@ -81,6 +81,9 @@ class Test {
     if (!callback) {
       callback = function () {};
     }
+    if (!options.contracts) {
+      throw new Error(__('No contracts specified in the options'));
+    }
     this.options = utils.recursiveMerge(this.options, options);
     this.simOptions = this.options.simulatorOptions || {};
     this.ready = false;
@@ -145,8 +148,8 @@ class Test {
   }
 
   require(module) {
-    if (module.startsWith('contracts/')) {
+    if (module.startsWith('Embark/contracts/')) {
-      const contractName = module.substr(10);
+      const contractName = module.substr(17);
       if (!this.engine.contractsManager.contracts[contractName]) {
         throw new Error(__('No contract with the name %s', contractName));
       }

test_apps/contracts_app/test/another_storage_spec.js

@@ -1,21 +1,24 @@
-contract("AnotherStorage", function() {
+/*global contract, config, it, embark*/
-  this.timeout(0);
+const assert = require('assert');
-  before(function(done) {
+const AnotherStorage = embark.require('Embark/contracts/AnotherStorage');
-    this.timeout(0);
+const SimpleStorage = embark.require('Embark/contracts/SimpleStorage');
-    var contractsConfig = {
+
+config({
+  contracts: {
     "SimpleStorage": {
       args: [100]
     },
     "AnotherStorage": {
       args: ["$SimpleStorage"]
     }
-    };
+  }
-    EmbarkSpec.deployAll(contractsConfig, () => { done() });
 });
 
+contract("AnotherStorage", function() {
+  this.timeout(0);
+
   it("set SimpleStorage address", async function() {
     let result = await AnotherStorage.methods.simpleStorageAddress().call();
     assert.equal(result.toString(), SimpleStorage.options.address);
   });
-
 });

test_apps/contracts_app/test/simple_storage_spec.js

@@ -1,6 +1,6 @@
 /*global contract, config, it, embark*/
 const assert = require('assert');
-const SimpleStorage = embark.require('contracts/SimpleStorage');
+const SimpleStorage = embark.require('Embark/contracts/SimpleStorage');
 
 config({
   contracts: {