updated ember data and friends to 2.8

updated mockjax to 2.2.1

Author: danielspaniel

.ember-cli

@@ -0,0 +1,9 @@
+{
+  /**
+    Ember CLI sends analytics information by default. The data is completely
+    anonymous, but there are times when you might want to disable this behavior.
+
+    Setting `disableAnalytics` to true will prevent any data from being sent.
+  */
+  "disableAnalytics": false
+}

.npmignore

@@ -10,11 +10,12 @@
 /vendor
 .bowerrc
 .editorconfig
+.watchmanconfig
 .ember-cli
 .idea/*
 .travis.yml
-testem.json
-Brocfile.js
+ember-cli-build.js
+testem.js
 bower.json
 
 

.watchmanconfig

@@ -0,0 +1,3 @@
+{
+  "ignore_dirs": ["tmp", "dist"]
+}

README.md

@@ -818,7 +818,7 @@ You would use this to make models like:
     if (environment === 'development') {
       ENV.factoryGuy = true;
       ENV.locationType = 'auto';
-      ENV.baseURL = '/';
+      ENV.rootURL = '/';
     }
 
     ```
@@ -946,7 +946,7 @@ If you are making an addon with factories and you want the factories available t
 ```javascript
   let projects = makeList('projects', 2); // put projects in the store
   let user = make('user', { projects });  // attatch them to user
-  mockFind('user').returns({model: user}); // now the mock will return a user that has projects
+  mockFindRecord('user').returns({model: user}); // now the mock will return a user that has projects
 ```
   - using `fails()` with errors hash is not working reliably
     - so you can always just `mockWhatever(args).fails()`
@@ -1086,7 +1086,7 @@ test("Using FactoryGuy.cacheOnlyMode with except", function() {
   - for mocking the ajax calls made by ember-data.
   - this library is installed with ember-data-factory-guy.
 - http GET mocks
-  - [mockFind](https://github.com/danielspaniel/ember-data-factory-guy#mockfind)
+  - [mockFindRecord](https://github.com/danielspaniel/ember-data-factory-guy#mockfindRecord)
   - [mockFindAll](https://github.com/danielspaniel/ember-data-factory-guy#mockfindall)
   - [mockReload](https://github.com/danielspaniel/ember-data-factory-guy#mockreload)
   - [mockQuery](https://github.com/danielspaniel/ember-data-factory-guy#mockquery)
@@ -1113,7 +1113,7 @@ test("Using FactoryGuy.cacheOnlyMode with except", function() {
 
 - Use property ```timesCalled``` to verify how many times the ajax call was mocked
   - works when you are using mockQuery, mockQueryRecord, mockFindAll, or mockUpdate
-  - mockFind will always be at most 1 since it will only make ajax call
+  - mockFindRecord will always be at most 1 since it will only make ajax call
     the first time, and then the store will use cache the second time
   - Example:
   ```javascript
@@ -1162,40 +1162,40 @@ The `isDestroyed` property is set to `true` when the mock is destroyed.
     let mock = mockFindAll('user').fails({status: 401, response: errors401});
 
     let errors422 = {errors: {name: "Name too short"}};
-    let mock = mockFind('profile').fails({status: 422, response: errors422});
+    let mock = mockFindRecord('profile').fails({status: 422, response: errors422});
 
     let errorsMine = {errors: [{detail: "Name too short", title: "I am short"}]};
-    let mock = mockFind('profile').fails({status: 422, response: errorsMine, convertErrors: false});
+    let mock = mockFindRecord('profile').fails({status: 422, response: errorsMine, convertErrors: false});
   ```
 
 
-##### mockFind
+##### mockFindRecord
   - For dealing with finding one record of a model type => `store.find('modelType')`
   - Can pass in arguments just like you would for [make](https://github.com/danielspaniel/ember-data-factory-guy#make) or [build](https://github.com/danielspaniel/ember-data-factory-guy#build)
-    - mockFind( fixture or model name, optional traits, optional attributes object)
+    - mockFindRecord( fixture or model name, optional traits, optional attributes object)
   - Takes modifier method `returns()` for controlling the response payload
     - returns( model / json / id )
-  - Sample acceptance tests using mockFind: [user-view-test.js:](https://github.com/danielspaniel/ember-data-factory-guy/blob/master/tests/acceptance/user-view-test.js)
+  - Sample acceptance tests using mockFindRecord: [user-view-test.js:](https://github.com/danielspaniel/ember-data-factory-guy/blob/master/tests/acceptance/user-view-test.js)
 
 Usage:
 ```javascript
-   import { build, make, mockFind } from 'ember-data-factory-guy';
+   import { build, make, mockFindRecord } from 'ember-data-factory-guy';
 ```
 - To return default factory model type ( 'user' in this case )
 ```javascript
-   // mockFind automatically returns json for the modelType ( in this case 'user' )
-   let mock = mockFind('user');
+   // mockFindRecord automatically returns json for the modelType ( in this case 'user' )
+   let mock = mockFindRecord('user');
    let userId = mock.get('id');
 ```
 - Using `returns({json})` to return json object
 ```javascript
    let user = build('user', 'whacky', {isDude: true});
-   let mock = mockFind('user').returns({ json: user });
+   let mock = mockFindRecord('user').returns({ json: user });
    // user.get('id') => 1
    // user.get('style') => 'whacky'
 
    // or to acccomplish the same thing with less code
-   let mock = mockFind('user', 'whacky', {isDude: true});
+   let mock = mockFindRecord('user', 'whacky', {isDude: true});
    // mock.get('id') => 1
    // mock.get('style') => 'whacky'
    let user = mock.get();
@@ -1205,15 +1205,15 @@ Usage:
 - Using `returns({model})` to return model instance
 ```javascript
    let user = make('user', 'whacky', {isDude: false});
-   let mock = mockFind('user').returns({ model: user });
+   let mock = mockFindRecord('user').returns({ model: user });
    // user.get('id') => 1
    // you can now also user.get('any-computed-property')
    // since you have a real model instance
 ```
 - Simper way to return a model instance
 ```javascript
    let user = make('user', 'whacky', {isDude: false});
-   let mock = mockFind(user);
+   let mock = mockFindRecord(user);
    // user.get('id') === mock.get('id')
    // basically a shortcut to the above .returns({ model: user })
    // as this sets up the returns for you
@@ -1227,12 +1227,12 @@ Usage:
 ```
 - To mock failure case use `fails` method
 ```javascript
-   mockFind('user').fails();
+   mockFindRecord('user').fails();
 ```
 - To mock failure when you have a model already
 ```javascript
   let profile = make('profile');
-  mockFind(profile).fails();
+  mockFindRecord(profile).fails();
   // mock.get('id') === profile.id
 ```
 

addon/mocks/exposed-request-functions.js

@@ -28,21 +28,21 @@ export function mockTeardown() {
  // Typically you will use like:
 
  // To return default factory 'user'
- let mock = mockFind('user');
+ let mock = mockFindRecord('user');
  let userId = mock.get('id');
 
  // or to return custom factory built json object
  let json = build('user', 'with_whacky_name', {isDude: true});
- let mock = mockFind('user').returns({json});
+ let mock = mockFindRecord('user').returns({json});
  let userId = json.get('id');
 
  // you could also make the model first and mock that find fails
  let user = make('user')
- let mock = mockFind(user);
+ let mock = mockFindRecord(user);
  let userId = user.id // or mock.get('id')
 
  // To mock failure case use method fails
- mockFind('user').fails();
+ mockFindRecord('user').fails();
 
  // Then to 'find' the user
  store.find('user', userId);

blueprints/ember-data-factory-guy/index.js

@@ -3,7 +3,7 @@ module.exports = {
   normalizeEntityName: function() {},
 
   afterInstall: function() {
-    return this.addBowerPackageToProject('jquery-mockjax', '2.2.0');
+    return this.addBowerPackageToProject('jquery-mockjax', '2.2.1');
   }
 
 };

bower.json

@@ -27,15 +27,14 @@
     "tests"
   ],
   "dependencies": {
-    "jquery-mockjax": "2.2.0",
-    "ember-cli-test-loader": "0.2.2",
+    "jquery-mockjax": "2.2.1",
     "ember-qunit-notifications": "0.1.0"
   },
   "devDependencies": {
     "jquery": ">1.9.0",
-    "ember": "2.5.1",
+    "ember": "2.8.1",
     "handlebars": "latest",
-    "ember-cli-shims": "0.1.1",
+    "ember-cli-shims": "0.1.3",
     "qunit": "~2.0.0",
     "ember-qunit": "latest",
     "ember-qunit-notifications": "latest",

config/ember-try.js

@@ -3,33 +3,52 @@ module.exports = {
   scenarios: [
     {
       name: 'default',
-      dependencies: { }
+      bower: {
+        dependencies: { }
+      }
+    },
+    {
+      name: 'ember-1.13',
+      bower: {
+        dependencies: {
+          'ember': '~1.13.0'
+        },
+        resolutions: {
+          'ember': '~1.13.0'
+        }
+      }
     },
     {
       name: 'ember-release',
-      dependencies: {
-        'ember': 'components/ember#release'
-      },
-      resolutions: {
-        'ember': 'release'
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#release'
+        },
+        resolutions: {
+          'ember': 'release'
+        }
       }
     },
     {
       name: 'ember-beta',
-      dependencies: {
-        'ember': 'components/ember#beta'
-      },
-      resolutions: {
-        'ember': 'beta'
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#beta'
+        },
+        resolutions: {
+          'ember': 'beta'
+        }
       }
     },
     {
       name: 'ember-canary',
-      dependencies: {
-        'ember': 'components/ember#canary'
-      },
-      resolutions: {
-        'ember': 'canary'
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#canary'
+        },
+        resolutions: {
+          'ember': 'canary'
+        }
       }
     }
   ]

package.json

@@ -29,23 +29,21 @@
   "devDependencies": {
     "active-model-adapter": "2.1.1",
     "broccoli-asset-rev": "^2.1.2",
-    "ember-cli": "^2.5.0",
+    "ember-cli": "^2.8.0",
     "ember-cli-app-version": "1.0.0",
     "ember-cli-babel": "latest",
-    "ember-cli-content-security-policy": "0.5.0",
-    "ember-cli-dependency-checker": "^1.0.1",
+    "ember-cli-dependency-checker": "^1.2.0",
     "ember-cli-htmlbars": "latest",
-    "ember-cli-htmlbars-inline-precompile": "~0.3.2",
-    "ember-cli-ic-ajax": "latest",
+    "ember-cli-htmlbars-inline-precompile": "~0.3.5",
     "ember-cli-qunit": "2.0.2",
     "ember-cli-sri": "^2.1.0",
+    "ember-cli-test-loader": "1.1.0",
     "ember-cli-uglify": "1.2.0",
-    "ember-data": "2.7.0",
+    "ember-data": "2.8.1",
     "ember-data-model-fragments": "~2.3.1",
     "ember-disable-prototype-extensions": "1.1.0",
     "ember-django-adapter": "1.1.2",
-    "ember-export-application-global": "latest",
-    "ember-load-initializers": "^0.5.0",
+    "ember-load-initializers": "^0.5.1",
     "ember-resolver": "2.0.3",
     "ember-sinon": "0.5.1",
     "loader.js": "4.0.9"

testem.json testem.js

@@ -1,4 +1,5 @@
-{
+/*jshint node:true*/
+module.exports = {
   "framework": "qunit",
   "test_page": "tests/index.html?hidepassed",
   "disable_watching": true,
@@ -9,4 +10,4 @@
     "PhantomJS",
     "Chrome"
   ]
-}
+};

tests/acceptance/employee-view-test.js

@@ -1,4 +1,4 @@
-import { make, build, buildList, mockFind, mockCreate } from 'ember-data-factory-guy';
+import { make, build, buildList, mockFindRecord, mockCreate } from 'ember-data-factory-guy';
 import moduleForAcceptance from '../helpers/module-for-acceptance';
 
 moduleForAcceptance('Acceptance | Employee View ( model-fragments )');
@@ -9,7 +9,7 @@ test("Show employee by make(ing) a model ( with hasMany fragment added manually
   let departmentEmployments = buildList('department-employment', 2).get();
   let employee = make('employee', { departmentEmployments });
 
-  mockFind('employee').returns({model: employee});
+  mockFindRecord('employee').returns({model: employee});
   visit('/employee/' + employee.get('id'));
 
   andThen(()=>{
@@ -21,7 +21,7 @@ test("Show employee by make(ing) a model ( with hasMany fragment added manually
 test("Show employee by make(ing) a model and using returns with that model", function () {
   let employee = make('employee', 'with_department_employments');
 
-  mockFind('employee').returns({model: employee});
+  mockFindRecord('employee').returns({model: employee});
   visit('/employee/' + employee.get('id'));
 
   andThen(()=>{
@@ -34,7 +34,7 @@ test("Show employee by building(ing) json and using returns with that json", fun
   // 'with_department_employments' is a trait that build the has many in the employee factory 
   let employee = build('employee', 'with_department_employments');
 
-  mockFind('employee').returns({json: employee});
+  mockFindRecord('employee').returns({json: employee});
   visit('/employee/' + employee.get('id'));
 
   andThen(()=>{
@@ -47,7 +47,7 @@ test("Show employee by building(ing) json ( with hasMany fragment added manually
   let departmentEmployments = buildList('department-employment', 2).get();
   let employee = build('employee', { departmentEmployments });
 
-  mockFind('employee').returns({json: employee});
+  mockFindRecord('employee').returns({json: employee});
   visit('/employee/' + employee.get('id'));
 
   andThen(()=>{

tests/acceptance/user-view-test.js

@@ -1,4 +1,4 @@
-import { make, build, buildList, mockFind, mockCreate } from 'ember-data-factory-guy';
+import { make, build, buildList, mockFindRecord, mockCreate } from 'ember-data-factory-guy';
 import moduleForAcceptance from '../helpers/module-for-acceptance';
 
 moduleForAcceptance('Acceptance | User View');
@@ -10,7 +10,7 @@ test("Show user by make(ing) a model and using returns with that model", functio
   // if you need the computed properties on the model this is best bet
   let user = make('user', 'with_projects');
   let projects = user.get('projects');
-  mockFind('user').returns({model: user});
+  mockFindRecord('user').returns({model: user});
 
   visit('/user/' + user.get('id'));
 
@@ -29,7 +29,7 @@ test("Show user with projects by build(ing) json and using returns with json", f
   // therefore be put in the store when user is loaded )
   let projects = buildList('project', {title: 'Moo'}, {title: 'Zoo'});
   let user = build('user', {projects: projects});
-  mockFind('user').returns({json: user});
+  mockFindRecord('user').returns({json: user});
 
   visit('/user/' + user.get('id'));
 
@@ -44,7 +44,7 @@ test("Show user with projects by build(ing) json and using returns with json", f
 
 test("Add a project to a user with mockCreate", function () {
   // mockFind will build a default user for the json payload
-  let mock = mockFind('user');
+  let mock = mockFindRecord('user');
 
   visit('/user/' + mock.get('id'));