Upgrade to ember-cli/ember/ember-data 2.5.1 (FirebaseExtended#386)

bengala-tech · Jun 4, 2016 · ec13fbd · ec13fbd
1 parent 1a33473
commit ec13fbd
Show file tree

Hide file tree

Showing 35 changed files with 237 additions and 168 deletions.
diff --git a/.npmignore b/.npmignore
@@ -1,16 +1,16 @@
-bower_components/
-tests/
-tmp/
-dist/
-
+/bower_components
+/config/ember-try.js
+/dist
+/tests
+/tmp
+**/.gitkeep
 .bowerrc
 .editorconfig
 .ember-cli
+.gitignore
+.jshintrc
+.watchmanconfig
 .travis.yml
-.npmignore
-**/.gitkeep
 bower.json
 ember-cli-build.js
-Brocfile.js
-gulpfile.js
-testem.json
+testem.js
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 ---
 language: node_js
 node_js:
-  - stable
+  - "4"
 
 sudo: false
 
@@ -14,10 +14,9 @@ cache:
     - node_modules
 
 env:
-  - EMBER_TRY_SCENARIO=ember-data-1.13.x
-  - EMBER_TRY_SCENARIO=ember-data-2.0.x
-  - EMBER_TRY_SCENARIO=ember-data-2.1.x
-  - EMBER_TRY_SCENARIO=ember-data-2.2.x
+  - EMBER_TRY_SCENARIO=ember-data-2.3.x
+  - EMBER_TRY_SCENARIO=ember-data-2.4.x
+  - EMBER_TRY_SCENARIO=ember-data-2.5.x
   - EMBER_TRY_SCENARIO=ember-data-beta
   - EMBER_TRY_SCENARIO=ember-data-canary
 
@@ -27,9 +26,9 @@ matrix:
     - env: EMBER_TRY_SCENARIO=ember-data-canary
 
 before_install:
-  - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
-  - "npm config set spin false"
-  - "npm install -g npm@^2"
+  - npm config set spin false
+  - npm install -g bower
+  - npm install phantomjs-prebuilt
 
 install:
   - npm install -g bower
@@ -38,4 +37,4 @@ install:
 
 script:
   - npm run legacy
-  - ember try $EMBER_TRY_SCENARIO test --skip-cleanup
+  - ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
diff --git a/.watchmanconfig b/.watchmanconfig
@@ -1,3 +1,3 @@
 {
-  "ignore_dirs": ["tmp"]
+  "ignore_dirs": ["tmp", "dist"]
 }
diff --git a/bower.json b/bower.json
@@ -30,26 +30,17 @@
     "package.json"
   ],
   "dependencies": {
-    "firebase": "2.x.x",
-    "ember-data": ">=1.13.6"
+    "firebase": "2.x.x"
   },
   "devDependencies": {
-    "ember": "2.0.2",
-    "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
-    "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
-    "ember-mocha": "0.8.2",
-    "ember-test-helpers": "0.5.9",
-    "ember-resolver": "^0.1.18",
-    "jquery": "2.1.4",
-    "loader.js": "ember-cli/loader.js#3.2.1",
+    "ember": "2.5.1",
+    "ember-cli-shims": "0.1.1",
+    "ember-cli-test-loader": "0.2.2",
+    "ember-mocha": "0.8.11",
     "moment": "2.10.3",
     "blueimp-md5": "1.1.0",
     "normalize-css": "3.0.3",
     "sinon": "http://sinonjs.org/releases/sinon-1.16.1.js",
     "mockfirebase": "0.11.0"
-  },
-  "resolutions": {
-    "ember" : "2.0.2"
   }
 }
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -2,57 +2,49 @@
 module.exports = {
   scenarios: [
     {
-      name: 'ember-data-1.13.x',
-      dependencies: {
-        'ember-data': '^1.13.11'
-      },
-      resolutions: {
-        'ember-data': '^1.13.11'
+      name: 'ember-data-2.3.x',
+      npm: {
+        devDependencies: {
+          'ember-data': '~2.3.0'
+        }
       }
     },
     {
-      name: 'ember-data-2.0.x',
-      dependencies: {
-        'ember-data': '2.0.x'
-      },
-      resolutions: {
-        'ember-data': '2.0.x'
+      name: 'ember-data-2.4.x',
+      npm: {
+        devDependencies: {
+          'ember-data': '~2.4.0'
+        }
       }
     },
     {
-      name: 'ember-data-2.1.x',
-      dependencies: {
-        'ember-data': '2.1.x'
-      },
-      resolutions: {
-        'ember-data': '2.1.x'
-      }
-    },
-    {
-      name: 'ember-data-2.2.x',
-      dependencies: {
-        'ember-data': '2.2.x'
-      },
-      resolutions: {
-        'ember-data': '2.2.x'
+      name: 'ember-data-2.5.x',
+      npm: {
+        devDependencies: {
+          'ember-data': '~2.5.0'
+        }
       }
     },
     {
       name: 'ember-data-beta',
-      dependencies: {
-        'ember-data': 'components/ember-data#beta'
-      },
-      resolutions: {
-        'ember-data': 'beta'
+      bower: {
+        dependencies: {
+          'ember-data': 'components/ember-data#beta'
+        },
+        resolutions: {
+          'ember-data': 'components/ember-data#beta'
+        }
       }
     },
     {
       name: 'ember-data-canary',
-      dependencies: {
-        'ember-data': 'components/ember-data#canary'
-      },
-      resolutions: {
-        'ember-data': 'canary'
+      bower: {
+        dependencies: {
+          'ember-data': 'components/ember-data#canary'
+        },
+        resolutions: {
+          'ember-data': 'components/ember-data#canary'
+        }
       }
     }
   ]

diff --git a/config/environment.js b/config/environment.js
@@ -1,4 +1,4 @@
-/* jshint node: true */
+/*jshint node:true*/
 'use strict';
 
 module.exports = function(/* environment, appConfig */) {

diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -1,13 +1,14 @@
+/*jshint node:true*/
 /* global require, module */
-var EmberApp = require('ember-cli/lib/broccoli/ember-addon');
+var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {
-  var app = new EmberApp(defaults, {
+  var app = new EmberAddon(defaults, {
     // Add options here
   });
 
   /*
-    This build file specifes the options for the dummy test app of this
+    This build file specifies the options for the dummy test app of this
     addon, located in `/tests/dummy`
     This build file does *not* influence how the addon or the app using it
     behave. You most likely want to be modifying `./index.js` or app's build file

diff --git a/gulpfile.js b/gulpfile.js
@@ -18,7 +18,12 @@ gulp.task('clean-dist', function (cb) {
   del(['dist/'], cb);
 });
 
-gulp.task('build-legacy', ['lint'], function() {
+gulp.task('test-page', ['clean-dist'], function() {
+  return gulp.src('vendor/legacy/index.html')
+    .pipe(gulp.dest('dist'));
+});
+
+gulp.task('build-legacy', ['lint', 'clean-dist'], function() {
   var b = browserify(['vendor/legacy/emberfire.js'], {
     debug: true
   });
@@ -32,7 +37,7 @@ gulp.task('build-legacy', ['lint'], function() {
     .pipe(gulp.dest('dist'));
 });
 
-gulp.task('build-legacy-minified', ['build-legacy'], function() {
+gulp.task('build-legacy-minified', ['build-legacy', 'test-page'], function() {
   return gulp.src('dist/emberfire.js')
     .pipe($.rename('emberfire.min.js'))
     .pipe($.uglify())
@@ -43,6 +48,6 @@ gulp.task('build-legacy-minified', ['build-legacy'], function() {
     .pipe(gulp.dest('dist'));
 });
 
-gulp.task('legacy', ['clean-dist', 'build-legacy-minified']);
+gulp.task('legacy', ['build-legacy-minified']);
 
 gulp.task('default', ['legacy']);
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
   "scripts": {
     "start": "ember server",
     "build": "ember build",
-    "test": "ember test",
+    "test": "ember try:testall",
     "legacy": "gulp legacy"
   },
   "repository": {
@@ -43,46 +43,50 @@
     "firebase": "global:Firebase"
   },
   "dependencies": {
-    "chalk": "1.1.0",
-    "ember-cli-babel": "5.0.0",
-    "ember-lodash": "0.0.3",
-    "fs-extra": "0.22.1",
-    "rsvp": "3.0.18"
+    "chalk": "1.1.3",
+    "ember-cli-babel": "5.1.6",
+    "ember-lodash": "0.0.7",
+    "fs-extra": "0.30.0",
+    "rsvp": "3.2.1"
   },
   "devDependencies": {
-    "babelify": "6.1.2",
-    "broccoli-asset-rev": "2.1.0",
+    "broccoli-asset-rev": "^2.4.2",
+    "ember-ajax": "0.7.1",
+    "ember-cli": "2.5.1",
+    "ember-cli-app-version": "^1.0.0",
+    "ember-cli-dependency-checker": "^1.2.0",
+    "ember-cli-htmlbars": "^1.0.3",
+    "ember-cli-htmlbars-inline-precompile": "^0.3.1",
+    "ember-cli-inject-live-reload": "^1.4.0",
+    "ember-cli-jshint": "^1.0.0",
+    "ember-cli-mocha": "0.10.2",
+    "ember-cli-release": "0.2.8",
+    "ember-cli-sri": "^2.1.0",
+    "ember-cli-uglify": "^1.2.0",
+    "ember-data": "^2.5.0",
+    "ember-disable-prototype-extensions": "^1.1.0",
+    "ember-export-application-global": "^1.0.5",
+    "ember-load-initializers": "^0.5.1",
+    "ember-resolver": "^2.0.3",
+    "ember-try": "^0.2.2",
+    "loader.js": "^4.0.1",
+
+    "babelify": "6.4.0",
+    "browserify-shim": "3.8.12",
     "browserify": "10.2.6",
-    "browserify-shim": "3.8.9",
     "del": "1.2.0",
-    "ember-cli": "1.13.8",
-    "ember-cli-app-version": "0.4.0",
-    "ember-cli-content-security-policy": "0.4.0",
-    "ember-cli-dependency-checker": "1.0.1",
-    "ember-cli-htmlbars": "0.7.9",
-    "ember-cli-htmlbars-inline-precompile": "0.1.3",
-    "ember-cli-ic-ajax": "0.2.1",
-    "ember-cli-inject-live-reload": "1.3.1",
-    "ember-cli-mocha": "0.9.1",
-    "ember-cli-release": "0.2.4",
-    "ember-cli-uglify": "1.2.0",
-    "ember-data": "2.0.0",
-    "ember-disable-prototype-extensions": "1.0.1",
-    "ember-disable-proxy-controllers": "1.0.0",
-    "ember-export-application-global": "1.0.2",
-    "ember-try": "0.0.7",
     "glob": "5.0.13",
-    "gulp": "3.9.0",
+    "gulp": "3.9.1",
     "gulp-concat": "2.6.0",
-    "gulp-header": "1.2.2",
+    "gulp-header": "1.8.2",
     "gulp-jshint": "1.11.2",
     "gulp-load-plugins": "0.10.0",
     "gulp-rename": "1.2.2",
-    "gulp-sourcemaps": "1.5.2",
-    "gulp-uglify": "1.2.0",
-    "gulp-util": "3.0.6",
-    "lodash": "3.10.0",
-    "torii": "0.6.1",
+    "gulp-sourcemaps": "1.6.0",
+    "gulp-uglify": "1.5.3",
+    "gulp-util": "3.0.7",
+    "lodash": "3.10.1",
+    "torii": "0.8.0",
     "vinyl-buffer": "1.0.0",
     "vinyl-source-stream": "1.1.0"
   }

diff --git a/testem.json → testem.js b/testem.json → testem.js
@@ -1,5 +1,6 @@
-{
-  "framework": "qunit",
+/*jshint node:true*/
+module.exports = {
+  "framework": "mocha",
   "test_page": "tests/index.html?hidepassed",
   "disable_watching": true,
   "launch_in_ci": [
@@ -9,4 +10,4 @@
     "PhantomJS",
     "Chrome"
   ]
-}
+};
diff --git a/tests/acceptance/auth-test.js b/tests/acceptance/auth-test.js
@@ -6,10 +6,10 @@ import {
   afterEach
 } from 'mocha';
 import { expect } from 'chai';
-import Ember from 'ember';
 import sinon from 'sinon';
 import Firebase from 'firebase';
 import startApp from '../helpers/start-app';
+import destroyApp from '../helpers/destroy-app';
 import stubFirebase from '../helpers/stub-firebase';
 import unstubFirebase from '../helpers/unstub-firebase';
 import createTestRef from '../helpers/create-test-ref';
@@ -21,13 +21,13 @@ describe('Acceptance: /auth', function() {
     stubFirebase();
     application = startApp();
 
-    var provider = application.__container__.lookup('torii-provider:firebase');
+    var provider = application.__container__.lookup('emberfire@torii-provider:firebase');
     provider.set('firebase', createTestRef('acceptance'));
   });
 
   afterEach(function() {
     unstubFirebase();
-    Ember.run(application, 'destroy');
+    destroyApp(application);
   });
 
   it('can visit /auth', function() {

diff --git a/tests/acceptance/post-test.js b/tests/acceptance/post-test.js
@@ -8,6 +8,7 @@ import {
 import { expect } from 'chai';
 import Ember from 'ember';
 import startApp from '../helpers/start-app';
+import destroyApp from '../helpers/destroy-app';
 import replaceAppRef from '../helpers/replace-app-ref';
 import stubFirebase from '../helpers/stub-firebase';
 import unstubFirebase from '../helpers/unstub-firebase';
@@ -26,7 +27,7 @@ describe('Acceptance: /post/:id', function() {
 
   afterEach(function() {
     unstubFirebase();
-    Ember.run(application, 'destroy');
+    destroyApp(application);
   });
 
   it('can visit /post/post_1', function() {