fixes #306: put protractor tests in module folders

mwaylabs · Feb 12, 2016 · 1277658 · 1277658
1 parent f1bc4d6
commit 1277658
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/generators/module/index.js b/generators/module/index.js
@@ -105,7 +105,7 @@ module.exports = yeoman.Base.extend({
       // [email protected]
       this.copy('yo.png', modulePath + '/assets/images/[email protected]');
       // spec file
-      this.template('_module-debug.spec.js', 'test/protractor/' + this.moduleFolder + '-debug.spec.js');
+      this.template('_module-debug.spec.js', 'test/protractor/' + this.moduleFolder + '/debug.spec.js');
 
       // debug
       this.composeWith('m-ionic:controller', {

diff --git a/test/module.js b/test/module.js
@@ -106,7 +106,7 @@ describe('m-ionic:module', function () {
       if (options && options.mainModule) {
         debugCtrlFile = modulePath + '/controllers/debug-ctrl.js';
         debugCtrlName = utils.controllerName('Debug');
-        debugSpecFile = 'test/protractor/main-debug.spec.js';
+        debugSpecFile = 'test/protractor/main/debug.spec.js';
         configName = utils.configName();
 
         // module.js
@@ -116,7 +116,7 @@ describe('m-ionic:module', function () {
       else {
         debugCtrlFile = modulePath + '/controllers/' + moduleFolder + '-debug-ctrl.js';
         debugCtrlName = utils.controllerName(moduleName + 'Debug');
-        debugSpecFile = 'test/protractor/' + moduleFolder + '-debug.spec.js';
+        debugSpecFile = 'test/protractor/' + moduleFolder + '/debug.spec.js';
         configName = utils.configName(moduleName);
 
         // module.js