test(gen:expectedFiles): fix tests

Author: Awk34

src/test/get-expected-files.js

@@ -1,3 +1,32 @@
+const mapping = {
+  stylesheet: {
+    sass: 'scss',
+    stylus: 'styl',
+    less: 'less',
+    css: 'css'
+  },
+  markup: {
+    pug: 'pug',
+    html: 'html'
+  },
+  script: {
+    js: 'js',
+    ts: 'ts'
+  }
+};
+
+/**
+ * Generate an array of OAuth files based on type
+ *
+ * @param  {String} type - type of oauth
+ * @return {Array}       - array of files
+ *
+ */
+var oauthFiles = type => ([
+  `server/auth/${type}/index.js`,
+  `server/auth/${type}/passport.js`,
+]);
+
 /**
  * Generate an array of files to expect from a set of options
  *
@@ -6,67 +35,36 @@
  *
  */
 export function app(options) {
-  var mapping = {
-    stylesheet: {
-      sass: 'scss',
-      stylus: 'styl',
-      less: 'less',
-      css: 'css'
-    },
-    markup: {
-      pug: 'pug',
-      html: 'html'
-    },
-    script: {
-      js: 'js',
-      ts: 'ts'
-    }
-  },
-  files = [];
-
-  /**
-   * Generate an array of OAuth files based on type
-   *
-   * @param  {String} type - type of oauth
-   * @return {Array}       - array of files
-   *
-   */
-  var oauthFiles = function(type) {
-    return [
-      'server/auth/' + type + '/index.js',
-      'server/auth/' + type + '/passport.js',
-    ];
-  };
-
-
-  var script = mapping.script[options.transpiler === 'ts' ? 'ts' : 'js'],
-      markup = mapping.markup[options.markup],
-      stylesheet = mapping.stylesheet[options.stylesheet],
-      models = options.models ? options.models : options.odms[0];
+  let script = mapping.script[options.transpiler === 'ts' ? 'ts' : 'js'];
+  let markup = mapping.markup[options.markup];
+  let stylesheet = mapping.stylesheet[options.stylesheet];
+  let models = options.models ? options.models : options.odms[0];
 
   /* Core Files */
-  files = files.concat([
+  let files = [
     'client/favicon.ico',
     'client/robots.txt',
     'client/_index.html',
-    `client/polyfills.${script}`,
     'client/app/app.' + script,
+    'client/app/app.component.' + script,
     'client/app/app.config.' + script,
     'client/app/app.constants.' + script,
+    'client/app/app.module.' + script,
     'client/app/app.' + stylesheet,
+    `client/app/polyfills.${script}`,
     'client/app/main/main.component.' + script,
     'client/app/main/main.component.spec.' + script,
-    'client/app/main/main.routes.' + script,
+    'client/app/main/main.module.' + script,
     'client/app/main/main.' + markup,
     'client/app/main/main.' + stylesheet,
     'client/assets/images/yeoman.png',
+    'client/components/directives.module.' + script,
+    'client/components/util.' + script,
     'client/components/footer/footer.' + stylesheet,
     'client/components/footer/footer.' + markup,
     'client/components/footer/footer.component.' + script,
     'client/components/navbar/navbar.' + markup,
     'client/components/navbar/navbar.component.' + script,
-    'client/components/util/util.module.' + script,
-    'client/components/util/util.service.' + script,
     'server/.eslintrc',
     'server/app.js',
     'server/index.js',
@@ -106,9 +104,10 @@ export function app(options) {
     'spec.js',
     'webpack.build.js',
     'webpack.dev.js',
+    'webpack.make.js',
     'webpack.test.js',
-    'webpack.make.js'
-  ]);
+    'webpack.server.js'
+  ];
 
   /* TypeScript */
   if (options.transpiler === 'ts') {
@@ -136,15 +135,6 @@ export function app(options) {
     ]);
   }
 
-  /* Ui-Bootstrap */
-  if (options.uibootstrap) {
-    files = files.concat([
-      'client/components/modal/modal.' + markup,
-      'client/components/modal/modal.' + stylesheet,
-      'client/components/modal/modal.service.' + script
-    ]);
-  }
-
   /* Models - Mongoose or Sequelize */
   if (models) {
     files = files.concat([
@@ -167,18 +157,15 @@ export function app(options) {
       'client/app/account/account.module.' + script,
       'client/app/account/account.routes.' + script,
       'client/app/account/login/login.' + markup,
-      'client/app/account/login/login.module.' + script,
       'client/app/account/login/login.component.' + script,
       'client/app/account/settings/settings.' + markup,
-      'client/app/account/settings/settings.module.' + script,
-      'client/app/account/settings/settings.controller.' + script,
+      'client/app/account/settings/settings.component.' + script,
       'client/app/account/signup/signup.' + markup,
-      'client/app/account/signup/signup.module.' + script,
-      'client/app/account/signup/signup.controller.' + script,
-      'client/app/admin/index.' + script,
+      'client/app/account/signup/signup.component.' + script,
       'client/app/admin/admin.' + markup,
       'client/app/admin/admin.' + stylesheet,
-      'client/app/admin/admin.controller.' + script,
+      'client/app/admin/admin.component.' + script,
+      'client/app/admin/admin.module.' + script,
       'client/app/admin/admin.routes.' + script,
       'client/components/auth/auth.module.' + script,
       'client/components/auth/auth.service.' + script,
@@ -207,16 +194,16 @@ export function app(options) {
 
   if (options.oauth && options.oauth.length) {
     /* OAuth (see oauthFiles function above) */
-    options.oauth.forEach(function(type, i) {
+    options.oauth.forEach(type => {
       files = files.concat(oauthFiles(type.replace('Auth', '')));
     });
 
 
     files = files.concat([
-      'client/components/oauth-buttons/index.' + script,
       'client/components/oauth-buttons/oauth-buttons.' + stylesheet,
       'client/components/oauth-buttons/oauth-buttons.' + markup,
-      'client/components/oauth-buttons/oauth-buttons.controller.spec.' + script,
+      'client/components/oauth-buttons/oauth-buttons.component.' + script,
+      'client/components/oauth-buttons/oauth-buttons.component.spec.' + script,
       'client/components/oauth-buttons/oauth-buttons.directive.spec.' + script,
       'e2e/components/oauth-buttons/oauth-buttons.po.js'
     ]);