Merge pull request #21 from simonihmig/prepare-fastboot-1.0

Prepare for FastBoot 1.0

Author: rwjblue

.travis.yml

@@ -16,6 +16,8 @@ env:
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary
   - EMBER_TRY_SCENARIO=ember-default
+  - EMBER_TRY_SCENARIO=fastboot
+  - EMBER_TRY_SCENARIO=fastboot-ember-2.9
 
 matrix:
   fast_finish: true
@@ -25,9 +27,10 @@ matrix:
 before_install:
   - npm config set spin false
   - export PATH=$HOME/.yarn/bin:$PATH
-  - yarn global add phantomjs-prebuilt
+  - yarn global add phantomjs-prebuilt bower
   - npm --version
   - yarn --version
+  - bower --version
   - phantomjs --version
 
 install:

…10/instance-initializers/browser/head.js app-lt-2-10/instance-initializers/head.jsapp-lt-2-10/instance-initializers/browser/head.js renamed to app-lt-2-10/instance-initializers/head.js app-lt-2-10/instance-initializers/browser/head.js renamed to app-lt-2-10/instance-initializers/head.js

@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import ENV from '../../config/environment';
+import ENV from '../config/environment';
 
 export function initialize(instance) {
   if (ENV['ember-cli-head'] && ENV['ember-cli-head']['suppressBrowserRender']) { return true; }
@@ -17,5 +17,9 @@ export function initialize(instance) {
 
 export default {
   name: 'head-browser',
-  initialize: initialize
+  initialize() {
+    if (typeof FastBoot === 'undefined') {
+      initialize(...arguments);
+    }
+  }
 };

app/instance-initializers/fastboot/head.js

@@ -7,5 +7,5 @@ export function initialize(owner) {
 
 export default {
   name: 'head-fastboot',
-  initialize: initialize
+  initialize
 };

app/instance-initializers/browser/head.js app/instance-initializers/head.jsapp/instance-initializers/browser/head.js renamed to app/instance-initializers/head.js

@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import ENV from '../../config/environment';
+import ENV from '../config/environment';
 
 export function initialize(owner) {
   if (ENV['ember-cli-head'] && ENV['ember-cli-head']['suppressBrowserRender']) { return true; }
@@ -16,5 +16,9 @@ export function initialize(owner) {
 
 export default {
   name: 'head-browser',
-  initialize: initialize
+  initialize() {
+    if (typeof FastBoot === 'undefined') {
+      initialize(...arguments);
+    }
+  }
 };

config/ember-try.js

@@ -86,6 +86,24 @@ module.exports = {
       npm: {
         devDependencies: {}
       }
+    },
+    {
+      name: 'fastboot',
+      command: 'ember fastboot:test',
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
+      }
+    },
+    {
+      name: 'fastboot-ember-2.9',
+      command: 'ember fastboot:test --ember-version 2.9.0',
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
+      }
     }
   ]
 };

…0/instance-initializers/fastboot/head.js …0/instance-initializers/fastboot/head.jsapp-lt-2-10/instance-initializers/fastboot/head.js renamed to fastboot-lt-2-10/instance-initializers/fastboot/head.js app-lt-2-10/instance-initializers/fastboot/head.js renamed to fastboot-lt-2-10/instance-initializers/fastboot/head.js

@@ -15,5 +15,5 @@ export function initialize(instance) {
 
 export default {
   name: 'head-fastboot',
-  initialize: initialize
+  initialize
 };

fastboot-tests/fastboot-1.0-beta-test.js

@@ -0,0 +1,36 @@
+'use strict';
+
+const expect = require('chai').expect;
+const setupTest = require('ember-fastboot-addon-tests').setupTest;
+
+describe('FastBoot pre 1.0', function() {
+  setupTest('fastboot-beta', {
+      emberCliFastbootVersion: '1.0.0-beta.18'
+    }
+  );
+
+  it('index page', function() {
+    return this.visit('/')
+      .then(function(res) {
+        let $ = res.jQuery;
+        let response = res.response;
+
+        expect(response.statusCode).to.equal(200);
+        expect($('h1').text().trim()).to.equal('Hello page');
+        expect($('meta[property="og:title"]', 'head').attr('content')).to.equal('Hello page');
+      });
+  });
+
+  it('other page', function() {
+    return this.visit('/other-page')
+      .then(function(res) {
+        let $ = res.jQuery;
+        let response = res.response;
+
+        expect(response.statusCode).to.equal(200);
+        expect($('h1').text().trim()).to.equal('Other page');
+        expect($('meta[property="og:title"]', 'head').attr('content')).to.equal('Other page');
+      });
+  });
+
+});

fastboot-tests/fastboot-1.0-test.js

@@ -0,0 +1,35 @@
+'use strict';
+
+const expect = require('chai').expect;
+const setupTest = require('ember-fastboot-addon-tests').setupTest;
+
+describe('FastBoot 1.0', function() {
+  setupTest('fastboot', {
+    emberCliFastbootVersion: '1.0.0-rc.1'
+  });
+
+  it('index page', function() {
+    return this.visit('/')
+      .then(function(res) {
+        let $ = res.jQuery;
+        let response = res.response;
+
+        expect(response.statusCode).to.equal(200);
+        expect($('h1').text().trim()).to.equal('Hello page');
+        expect($('meta[property="og:title"]', 'head').attr('content')).to.equal('Hello page');
+      });
+  });
+
+  it('other page', function() {
+    return this.visit('/other-page')
+      .then(function(res) {
+        let $ = res.jQuery;
+        let response = res.response;
+
+        expect(response.statusCode).to.equal(200);
+        expect($('h1').text().trim()).to.equal('Other page');
+        expect($('meta[property="og:title"]', 'head').attr('content')).to.equal('Other page');
+      });
+  });
+
+});

fastboot-tests/fixtures/fastboot-beta/app/router.js

@@ -0,0 +1,13 @@
+import Ember from 'ember';
+import config from './config/environment';
+
+const Router = Ember.Router.extend({
+  location: config.locationType,
+  rootURL: config.rootURL
+});
+
+Router.map(function() {
+  this.route('other-page');
+});
+
+export default Router;

fastboot-tests/fixtures/fastboot-beta/app/routes/application.js

@@ -0,0 +1,10 @@
+import Ember from 'ember';
+
+const { set } = Ember;
+
+export default Ember.Route.extend({
+  headData: Ember.inject.service(),
+  afterModel() {
+    set(this, 'headData.title', "Hello page");
+  }
+});