fix: fix mobile-specific feature test

Author: filipesilva

addon/ng2/models/webpack-build-mobile.ts

@@ -1,11 +1,16 @@
 import * as webpack from 'webpack';
 import * as path from 'path';
 import * as OfflinePlugin from 'offline-plugin';
-import { PrerenderWebpackPlugin } from '../utilities/prerender-webpack-plugin.ts'
+import * as CopyWebpackPlugin from 'copy-webpack-plugin';
+import { PrerenderWebpackPlugin } from '../utilities/prerender-webpack-plugin.ts';
 
 export const getWebpackMobileConfigPartial = function (projectRoot: string) {
   return {
     plugins: [
+      new CopyWebpackPlugin([
+        {from: path.resolve(projectRoot, './src/icons'), to: path.resolve(projectRoot, './dist/icons')},
+        {from: path.resolve(projectRoot, './src/manifest.webapp'), to: path.resolve(projectRoot, './dist')}
+      ]),
       new PrerenderWebpackPlugin({
         templatePath: 'index.html',
         configPath: path.resolve(projectRoot, './src/main-app-shell.ts'),

addon/ng2/models/webpack-config.ts

@@ -30,7 +30,7 @@ export class NgCliWebpackConfig {
     if (CliConfig.fromProject().apps[0].mobile){
       this.webpackMobileConfigPartial = getWebpackMobileConfigPartial(this.ngCliProject.root);
       this.webpackMobileProdConfigPartial = getWebpackMobileProdConfigPartial(this.ngCliProject.root);
-      this.webpackDevConfigPartial = webpackMerge(this.webpackDevConfigPartial, this.webpackMobileConfigPartial);
+      this.webpackBaseConfig = webpackMerge(this.webpackBaseConfig, this.webpackMobileConfigPartial);
       this.webpackProdConfigPartial = webpackMerge(this.webpackProdConfigPartial, this.webpackMobileProdConfigPartial);
     }
 

tests/e2e/e2e_workflow.spec.js

@@ -89,19 +89,21 @@ describe('Basic end-to-end Workflow', function () {
     expect(mainBundleContent).to.include('production:!0');
   });
 
-  it_mobile('Enables mobile-specific production features', () => {
-    let index = fs.readFileSync(path.join(process.cwd(), 'dist/index.html'), 'utf-8');
+  it_mobile('Enables mobile-specific production features in prod builds', () => {
+    let indexHtml = fs.readFileSync(path.join(process.cwd(), 'dist/index.html'), 'utf-8');
     // Service Worker
-    expect(index.includes('if (\'serviceWorker\' in navigator) {')).to.be.equal(true);
-    expect(existsSync(path.join(process.cwd(), 'dist/worker.js'))).to.be.equal(true);
-
-    // Asynchronous bundle
-    expect(index.includes('<script src="/app-concat.js" async=""></script>')).to.be.equal(true);
-    expect(existsSync(path.join(process.cwd(), 'dist/app-concat.js'))).to.be.equal(true);
+    expect(indexHtml).to.match(/sw-install\.[0-9a-f]{20}\.bundle\.js/);
+    expect(existsSync(path.join(process.cwd(), 'dist/sw.js' ))).to.be.equal(true);
 
     // App Manifest
-    expect(index.includes('<link rel="manifest" href="/manifest.webapp">')).to.be.equal(true);
+    expect(indexHtml.includes('<link rel="manifest" href="/manifest.webapp">')).to.be.equal(true);
     expect(existsSync(path.join(process.cwd(), 'dist/manifest.webapp'))).to.be.equal(true);
+
+    // Icons folder
+    expect(existsSync(path.join(process.cwd(), 'dist/icons'))).to.be.equal(true);
+
+    // Prerender content
+    expect(indexHtml).to.match(/app works!/);
   });
 
   it('Can run `ng build` in created project', function () {

tests/runner.js

@@ -34,7 +34,7 @@ var Mocha = require('mocha');
 var glob = require('glob');
 var path = require('path');
 
-var root = 'tests/{acceptance,models,e2e}';
+var root = 'tests/{models,e2e}';
 var specFiles = glob.sync(root + '/**/*.spec.*');
 var mocha = new Mocha({ timeout: 5000, reporter: 'spec' });