Merge pull request #579 from snewcomer/upgrade-3.0

Upgrade 3.0

Author: rwjblue

.travis.yml

@@ -33,4 +33,3 @@ cache:
 before_install:
   - npm config set spin false
   - npm install -g npm@4
-  - npm i -g bower # for ember-cli-addon-tests

package.json

@@ -45,7 +45,7 @@
     "chai-fs": "^2.0.0",
     "co": "^4.6.0",
     "ember-ajax": "^3.0.0",
-    "ember-cli": "~2.18.0",
+    "ember-cli": "~3.0.0",
     "ember-cli-addon-tests": "^0.11.0",
     "ember-cli-dependency-checker": "^2.0.1",
     "ember-cli-eslint": "^4.2.1",
@@ -62,7 +62,7 @@
     "ember-maybe-import-regenerator-for-testing": "^1.0.0",
     "ember-resolver": "^4.3.0",
     "ember-sinon": "^1.0.0",
-    "ember-source": "~2.18.0",
+    "ember-source": "~3.0.0",
     "eslint-plugin-ember": "^5.0.0",
     "eslint-plugin-node": "^5.2.1",
     "glob": "^7.0.0",

testem.js

@@ -11,12 +11,14 @@ module.exports = {
     Chrome: {
       mode: 'ci',
       args: [
+        // --no-sandbox is needed when running Chrome inside a container
+        process.env.TRAVIS ? '--no-sandbox' : null,
+
         '--disable-gpu',
         '--headless',
-        '--no-sandbox',
         '--remote-debugging-port=0',
         '--window-size=1440,900'
-      ]
+      ].filter(Boolean)
     }
   }
 };

tests/acceptance/shoebox-retrieve-test.js

@@ -1,13 +1,14 @@
-import { test } from 'qunit';
-import moduleForAcceptance from '../../tests/helpers/module-for-acceptance';
+import { module, test } from 'qunit';
+import { visit, currentURL } from '@ember/test-helpers';
+import { setupApplicationTest } from 'ember-qunit';
 
-moduleForAcceptance('browser acceptance test | shoebox retrieve');
+module('browser acceptance test | shoebox retrieve', function(hooks) {
+  setupApplicationTest(hooks);
 
-test('it can retrieve items from the shoebox', function(assert) {
-  visit('/');
+  test('it can retrieve items from the shoebox', async function(assert) {
+    await visit('/');
 
-  andThen(function() {
     assert.equal(currentURL(), '/');
-    assert.equal(find('.shoebox').text().replace(/\s+/g, ' ').trim(), 'bar zap', 'the data was retreived from the shoebox');
+    assert.equal(this.element.querySelector('.shoebox').textContent.replace(/\s+/g, ' ').trim(), 'bar zap', 'the data was retreived from the shoebox');
   });
-});
+});

tests/dummy/config/targets.js

@@ -1,8 +1,16 @@
+const browsers = [
+  'last 1 Chrome versions',
+  'last 1 Firefox versions',
+  'last 1 Safari versions'
+];
+
+const isCI = !!process.env.CI;
+const isProduction = process.env.EMBER_ENV === 'production';
+
+if (isCI || isProduction) {
+  browsers.push('ie 11');
+}
+
 module.exports = {
-  browsers: [
-    'ie 9',
-    'last 1 Chrome versions',
-    'last 1 Firefox versions',
-    'last 1 Safari versions'
-  ]
+  browsers
 };

tests/unit/locations/none-test.js

@@ -1,12 +1,12 @@
-import { moduleFor, test } from 'ember-qunit';
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
 
-moduleFor('location:none', 'Unit | Location | none in the browser', {
-  // Specify the other units that are required for this test.
-  needs: ['service:fastboot']
-});
+module('Unit | Location | none in the browser', function(hooks) {
+  setupTest(hooks);
 
-test('setURL ', function (assert) {
-  let location = this.subject();
-  location.setURL('foo');
-  assert.equal(location.get('path'), 'foo', 'it should execute and not call fastboot code');
-});
+  test('setURL ', function (assert) {
+    let location = this.owner.lookup('location:none');
+    location.setURL('foo');
+    assert.equal(location.get('path'), 'foo', 'it should execute and not call fastboot code');
+  });
+});

tests/unit/services/fastboot-test.js

@@ -1,24 +1,27 @@
-import { moduleFor, test } from 'ember-qunit';
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
 
-moduleFor('service:fastboot', 'Unit | Service | fastboot in the browser', {});
+module('Unit | Service | fastboot in the browser', function(hooks) {
+  setupTest(hooks);
 
-test('isFastBoot', function(assert) {
-  let service = this.subject();
-  assert.equal(service.isFastBoot, false, `it should be false`);
-  assert.equal(service.get('isFastBoot'), false, `it should be false`);
-});
+  test('isFastBoot', function(assert) {
+    let service = this.owner.lookup('service:fastboot');
+    assert.equal(service.isFastBoot, false, `it should be false`);
+    assert.equal(service.get('isFastBoot'), false, `it should be false`);
+  });
 
-test('request', function(assert) {
-  let service = this.subject();
-  assert.equal(service.get('request'), null, `it should be null`);
-});
+  test('request', function(assert) {
+    let service = this.owner.lookup('service:fastboot');
+    assert.equal(service.get('request'), null, `it should be null`);
+  });
 
-test('response', function(assert) {
-  let service = this.subject();
-  assert.equal(service.get('response'), null, `it should be null`);
-});
+  test('response', function(assert) {
+    let service = this.owner.lookup('service:fastboot');
+    assert.equal(service.get('response'), null, `it should be null`);
+  });
 
-test('metadata', function(assert) {
-  let service = this.subject();
-  assert.equal(service.get('metadata'), null, `it should be null`);
-});
+  test('metadata', function(assert) {
+    let service = this.owner.lookup('service:fastboot');
+    assert.equal(service.get('metadata'), null, `it should be null`);
+  });
+});

tests/unit/services/fastboot/shoebox-test.js

@@ -1,88 +1,92 @@
-import { moduleFor, test } from 'ember-qunit';
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
 import sinon from 'sinon';
 
 let sandbox;
 
-moduleFor('service:fastboot', 'Unit | Service | fastboot | shoebox', {
-  beforeEach() {
+module('Unit | Service | fastboot | shoebox', function(hooks) {
+  setupTest(hooks);
+
+  hooks.beforeEach(function() {
     sandbox = sinon.sandbox.create();
-  },
-  afterEach() {
+  });
+
+  hooks.afterEach(function() {
     sandbox.restore();
-  }
-});
+  });
 
-test('retrieve returns value if isFastBoot false and key is cached', function(assert) {
-  let service = this.subject();
+  test('retrieve returns value if isFastBoot false and key is cached', function(assert) {
+    let service = this.owner.lookup('service:fastboot');
 
-  service.set('shoebox.foo', 'bar');
+    service.set('shoebox.foo', 'bar');
 
-  assert.strictEqual(service.get('shoebox').retrieve('foo'), 'bar');
-});
+    assert.strictEqual(service.get('shoebox').retrieve('foo'), 'bar');
+  });
 
-test('retrieve returns undefined if isFastBoot false and shoebox is missing', function(assert) {
-  let service = this.subject();
+  test('retrieve returns undefined if isFastBoot false and shoebox is missing', function(assert) {
+    let service = this.owner.lookup('service:fastboot');
 
-  let stub = sandbox.stub(document, 'querySelector').withArgs('#shoebox-foo');
+    let stub = sandbox.stub(document, 'querySelector').withArgs('#shoebox-foo');
 
-  assert.strictEqual(service.get('shoebox').retrieve('foo'), undefined);
+    assert.strictEqual(service.get('shoebox').retrieve('foo'), undefined);
 
-  sinon.assert.calledOnce(stub);
-});
+    sinon.assert.calledOnce(stub);
+  });
 
-test('retrieve returns undefined if isFastBoot false and textContent is missing', function(assert) {
-  let service = this.subject();
+  test('retrieve returns undefined if isFastBoot false and textContent is missing', function(assert) {
+    let service = this.owner.lookup('service:fastboot');
 
-  let stub = sandbox.stub(document, 'querySelector').withArgs('#shoebox-foo').returns({});
+    let stub = sandbox.stub(document, 'querySelector').withArgs('#shoebox-foo').returns({});
 
-  assert.strictEqual(service.get('shoebox').retrieve('foo'), undefined);
+    assert.strictEqual(service.get('shoebox').retrieve('foo'), undefined);
 
-  sinon.assert.calledOnce(stub);
-});
+    sinon.assert.calledOnce(stub);
+  });
 
-test('retrieve returns value if isFastBoot false and textContent is present', function(assert) {
-  let service = this.subject();
+  test('retrieve returns value if isFastBoot false and textContent is present', function(assert) {
+    let service = this.owner.lookup('service:fastboot');
 
-  let stub = sandbox.stub(document, 'querySelector').withArgs('#shoebox-foo').returns({
-    textContent: '{"foo":"bar"}'
-  });
+    let stub = sandbox.stub(document, 'querySelector').withArgs('#shoebox-foo').returns({
+      textContent: '{"foo":"bar"}'
+    });
+
+    assert.deepEqual(service.get('shoebox').retrieve('foo'), {
+      foo: 'bar'
+    });
 
-  assert.deepEqual(service.get('shoebox').retrieve('foo'), {
-    foo: 'bar'
+    sinon.assert.calledOnce(stub);
   });
 
-  sinon.assert.calledOnce(stub);
-});
+  test('retrieve returns undefined if isFastBoot true and shoebox is missing', function(assert) {
+    let service = this.owner.factoryFor('service:fastboot').create({
+      isFastBoot: true,
+      _fastbootInfo: {}
+    });
 
-test('retrieve returns undefined if isFastBoot true and shoebox is missing', function(assert) {
-  let service = this.subject({
-    isFastBoot: true,
-    _fastbootInfo: {}
+    assert.strictEqual(service.get('shoebox').retrieve('foo'), undefined);
   });
 
-  assert.strictEqual(service.get('shoebox').retrieve('foo'), undefined);
-});
+  test('retrieve returns undefined if isFastBoot true and key is missing', function(assert) {
+    let service = this.owner.factoryFor('service:fastboot').create({
+      isFastBoot: true,
+      _fastbootInfo: {
+        shoebox: {}
+      }
+    });
 
-test('retrieve returns undefined if isFastBoot true and key is missing', function(assert) {
-  let service = this.subject({
-    isFastBoot: true,
-    _fastbootInfo: {
-      shoebox: {}
-    }
+    assert.strictEqual(service.get('shoebox').retrieve('foo'), undefined);
   });
 
-  assert.strictEqual(service.get('shoebox').retrieve('foo'), undefined);
-});
-
-test('retrieve returns value if isFastBoot true and key is present', function(assert) {
-  let service = this.subject({
-    isFastBoot: true,
-    _fastbootInfo: {
-      shoebox: {
-        foo: 'bar'
+  test('retrieve returns value if isFastBoot true and key is present', function(assert) {
+    let service = this.owner.factoryFor('service:fastboot').create({
+      isFastBoot: true,
+      _fastbootInfo: {
+        shoebox: {
+          foo: 'bar'
+        }
       }
-    }
-  });
+    });
 
-  assert.strictEqual(service.get('shoebox').retrieve('foo'), 'bar');
-});
+    assert.strictEqual(service.get('shoebox').retrieve('foo'), 'bar');
+  });
+});