Tests: add init method

rootzh · Jan 22, 2016 · 7a78a2c · 7a78a2c
1 parent 145a7a8
commit 7a78a2c
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 40 deletions.
diff --git a/tests/all.js b/tests/all.js
@@ -10,12 +10,12 @@ describe('All Tests', function() {
   });
 
   after(function() {});
-  //require('./tests/classes/ServerlessEndpointTest');
-  //require('./tests/classes/ServerlessFunctionTest');
-  //require('./tests/classes/ServerlessModuleTest');
-  //require('./tests/classes/ServerlessComponentTest');
-  //require('./tests/classes/ServerlessProjectTest');
-  //require('./tests/classes/ServerlessStateTest');
+  require('./tests/classes/ServerlessEndpointTest');
+  require('./tests/classes/ServerlessFunctionTest');
+  require('./tests/classes/ServerlessModuleTest');
+  require('./tests/classes/ServerlessComponentTest');
+  require('./tests/classes/ServerlessProjectTest');
+  require('./tests/classes/ServerlessStateTest');
   //require('./tests/actions/TestPluginCustom');
   //require('./tests/actions/TestDefaultActionHook');
   //require('./tests/actions/StageCreate');
@@ -26,7 +26,7 @@ describe('All Tests', function() {
   //require('./tests/actions/EnvList');
   //require('./tests/actions/EnvGet');
   //require('./tests/actions/EnvSetUnset');
-  require('./tests/actions/ResourcesDeploy');
+  //require('./tests/actions/ResourcesDeploy');
   //require('./tests/actions/FunctionRun');
   //require('./tests/actions/FunctionDeploy');
   //require('./tests/actions/EndpointDeploy');

diff --git a/tests/tests/classes/ServerlessComponentTest.js b/tests/tests/classes/ServerlessComponentTest.js
@@ -30,12 +30,16 @@ describe('Test Serverless Component Class', function() {
           projectPath: projPath
         });
 
-        // Instantiate Class
-        instance = new serverless.classes.Component(serverless, {
-          component: 'nodejscomponent'
-        });
+        return serverless.init()
+          .then(function() {
+
+            // Instantiate Class
+            instance = new serverless.classes.Component(serverless, {
+              component: 'nodejscomponent'
+            });
 
-        done();
+            done();
+          });
       });
   });
 

diff --git a/tests/tests/classes/ServerlessEndpointTest.js b/tests/tests/classes/ServerlessEndpointTest.js
@@ -29,16 +29,20 @@ describe('Test Serverless Endpoint Class', function() {
           projectPath: projPath
         });
 
-        // Instantiate Class
-        instance = new serverless.classes.Endpoint(serverless, {
-          component:      'nodejscomponent',
-          module:         'module1',
-          function:       'function1',
-          endpointPath:   'module1/function1',
-          endpointMethod: 'GET'
-        });
+        return serverless.init()
+          .then(function() {
+
+            // Instantiate Class
+            instance = new serverless.classes.Endpoint(serverless, {
+              component: 'nodejscomponent',
+              module: 'module1',
+              function: 'function1',
+              endpointPath: 'module1/function1',
+              endpointMethod: 'GET'
+            });
 
-        done();
+            done();
+          });
       });
   });
 

diff --git a/tests/tests/classes/ServerlessFunctionTest.js b/tests/tests/classes/ServerlessFunctionTest.js
@@ -29,14 +29,18 @@ describe('Test Serverless Function Class', function() {
           projectPath: projPath
         });
 
-        // Instantiate Class
-        instance = new serverless.classes.Function(serverless, {
-          component: 'nodejscomponent',
-          module:    'module1',
-          function:  'function1'
-        });
+        return serverless.init()
+          .then(function() {
+
+            // Instantiate Class
+            instance = new serverless.classes.Function(serverless, {
+              component: 'nodejscomponent',
+              module: 'module1',
+              function: 'function1'
+            });
 
-        done();
+            done();
+          });
       });
   });
 

diff --git a/tests/tests/classes/ServerlessModuleTest.js b/tests/tests/classes/ServerlessModuleTest.js
@@ -30,13 +30,17 @@ describe('Test Serverless Module Class', function() {
           projectPath: projPath
         });
 
-        // Instantiate Class
-        instance = new serverless.classes.Module(serverless, {
-          component: 'nodejscomponent',
-          module:    'module1'
-        });
+        return serverless.init()
+          .then(function() {
+
+            // Instantiate Class
+            instance = new serverless.classes.Module(serverless, {
+              component: 'nodejscomponent',
+              module: 'module1'
+            });
 
-        done();
+            done();
+          });
       });
   });
 

diff --git a/tests/tests/classes/ServerlessProjectTest.js b/tests/tests/classes/ServerlessProjectTest.js
@@ -30,10 +30,14 @@ describe('Test Serverless Project Class', function() {
           projectPath: projPath
         });
 
-        // Instantiate Class
-        instance = new serverless.classes.Project(serverless);
+        return serverless.init()
+          .then(function() {
 
-        done();
+            // Instantiate Class
+            instance = new serverless.classes.Project(serverless);
+
+            done();
+          });
       });
   });
 

diff --git a/tests/tests/classes/ServerlessStateTest.js b/tests/tests/classes/ServerlessStateTest.js
@@ -29,10 +29,14 @@ describe('Test Serverless State Class', function() {
           projectPath: projPath
         });
 
-        // Instantiate Class
-        instance = new serverless.classes.State(serverless);
+        return serverless.init()
+          .then(function() {
 
-        done();
+            // Instantiate Class
+            instance = new serverless.classes.State(serverless);
+
+            done();
+          });
       });
   });