Merge pull request #797 from kiwiupover/move-dynamic-initializers-test

Author: Robert Jackson

packages/ember-cli-fastboot/test/fixtures/dynamic-initializers/app/initializers/initializer.js

@@ -0,0 +1,8 @@
+export default {
+  name: 'app-initializer',
+
+  initialize() {
+    return `Well, Prince, so Genoa and Lucca are now just family estates of the
+            Buonapartes.`
+  }
+}

packages/ember-cli-fastboot/test/fixtures/dynamic-initializers/app/instance-initializers/initializer.js

@@ -0,0 +1,7 @@
+export default {
+  name: 'instant-initialize',
+  initialize() {
+    return `But how do you do? I see I have frightened
+            you--sit down and tell me all the news.`
+  }
+}

packages/ember-cli-fastboot/test/fixtures/dynamic-initializers/fastboot/initializers/initializer.js

@@ -0,0 +1,10 @@
+export default {
+  name: 'initialize',
+  initialize() {
+    return `But I warn you, if you don't tell me that this means war,
+            if you still try to defend the infamies and horrors perpetrated by that
+            Antichrist--I really believe he is Antichrist--I will have nothing more
+            to do with you and you are no longer my friend, no longer my 'faithful
+            slave,' as you call yourself!`
+  }
+}

packages/ember-cli-fastboot/test/fixtures/dynamic-initializers/fastboot/instance-initializers/initializer.js

@@ -0,0 +1,7 @@
+export default {
+  name: 'instant-initialize',
+  initialize() {
+    return `It was in July, 1805, and the speaker was the well-known Anna Pavlovna
+            Scherer, maid of honor and favorite of the Empress Marya Fedorovna.`
+  }
+}

test-packages/basic-app/app/initializers/initializer.js

@@ -1,50 +1,53 @@
-'use strict';
-
 const chai = require('chai');
 const expect = chai.expect;
-chai.use(require('chai-fs'));
+const glob = require("glob");
+const execa = require("execa");
 
-const AddonTestApp = require('ember-cli-addon-tests').AddonTestApp;
+chai.use(require('chai-fs'));
 
 describe('dynamic initializers', function() {
-  this.timeout(300000);
+  this.timeout(100000);
 
-  let  app;
-
-  before(function() {
-    app = new AddonTestApp();
-
-    return app.create('dynamic-initializers', { emberVersion: 'latest'})
-      .then(function() {
-        return app.runEmberCommand('build');
-      });
+  before( async () => {
+    await execa("yarn", ["build"]);
   });
 
   it('filters FastBoot initializers from browser build', function() {
-    let appPath = app.filePath('dist/assets/dynamic-initializers.js');
+    const appPath = find('dist/assets/basic-app.js');
     expect(appPath).to.not.have.content.that.match(
       /But I warn you, if you don't tell me that this means war/);
+
     expect(appPath).to.have.content.that.match(
       /Well, Prince, so Genoa and Lucca are now just family estates/);
   });
 
   it('filters browser initializers from FastBoot build', function() {
-    let appPath = app.filePath('dist/assets/dynamic-initializers-fastboot.js');
+    const appPath = find('dist/assets/basic-app-fastboot.js');
+
     expect(appPath).to.have.content.that.match(
       /But I warn you, if you don't tell me that this means war/);
     expect(appPath).to.not.have.content.that.match(
       /Well, Prince, so Genoa and Lucca are now just family estates/);
   });
 
   it('filters FastBoot instance initializers from browser build', function() {
-    let appPath = app.filePath('dist/assets/dynamic-initializers.js');
+    const appPath = find('dist/assets/basic-app.js');
     expect(appPath).to.not.have.content.that.match(/It was in July, 1805/);
     expect(appPath).to.have.content.that.match(/But how do you do/);
   });
 
   it('filters browser instance initializers from FastBoot build', function() {
-    let appPath = app.filePath('dist/assets/dynamic-initializers-fastboot.js');
-    expect(appPath).to.have.content.that.match(/It was in July, 1805/);
-    expect(appPath).to.not.have.content.that.match(/But how do you do/);
+    const appFastbootPath = find('dist/assets/basic-app-fastboot.js');
+
+    expect(appFastbootPath).to.have.content.that.match(/It was in July, 1805/);
+    expect(appFastbootPath).to.not.have.content.that.match(/But how do you do/);
   });
+
+  function find(globPath) {
+    let files = glob.sync(globPath);
+
+    expect(files.length).to.equal(1, globPath);
+
+    return files[0];
+  }
 });