Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: adopted-ember-addons/ember-data-factory-guy
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.13.10
Choose a base ref
...
head repository: adopted-ember-addons/ember-data-factory-guy
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.0.0
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Aug 28, 2015

  1. doc update

    danielspaniel committed Aug 28, 2015
    Copy the full SHA
    d7fe8c4 View commit details

Commits on Aug 29, 2015

  1. - updated ember, ember-data, active-model adapter to 2.0 level

    - changed how adapter is determined to avoid import errors if ActiveModelAdapter is not used
    danielspaniel committed Aug 29, 2015

    Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    5a80cc7 View commit details
  2. 2.0.0

    danielspaniel committed Aug 29, 2015
    Copy the full SHA
    753e456 View commit details
Showing with 10 additions and 10 deletions.
  1. +1 −1 README.md
  2. +5 −5 addon/fixture-builder-factory.js
  3. +2 −2 bower.json
  4. +2 −2 package.json
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ ChangeLog: ( Notes about what has changed in each version )

##### Never used ember-data-factory-guy before

- ```ember install ember-data-factory-guy@1.13.9``` ( ember-data-1.13.5 + )
- ```ember install ember-data-factory-guy@1.13.10``` ( ember-data-1.13.5 + )
- ```ember install ember-data-factory-guy@1.13.2``` ( ember-data-1.13.0 + )
- ```ember install ember-data-factory-guy@1.1.2``` ( ember-data-1.0.0-beta.19.1 )
- ```ember install ember-data-factory-guy@1.0.10``` ( ember-data-1.0.0-beta.16.1 )
10 changes: 5 additions & 5 deletions addon/fixture-builder-factory.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import DS from 'ember-data';
import JSONAPIFixtureBuilder from './jsonapi-fixture-builder';
import AmsFixtureBuilder from './ams-fixture-builder';
import RESTFixtureBuilder from './rest-fixture-builder';
@@ -7,6 +6,7 @@ var FixtureBuilderFactory = function (store) {
var adapter = store.adapterFor('application');
/*
Using json api?
TODO: extract this to utility class, and fix some of the whacky logic
*/
this.useJSONAPI = function () {
var useJSONAPI = usingJSONAPIAdapter();
@@ -15,16 +15,16 @@ var FixtureBuilderFactory = function (store) {
return !isAMS && !isREST;
};
var usingAdapterType = function (adapterType) {
return DS[adapterType] && adapter instanceof DS[adapterType];
return adapter && adapter.toString().match(adapterType);
};
var usingJSONAPIAdapter = function () {
return usingAdapterType('JSONAPIAdapter');
return usingAdapterType('json-api');
};
var usingActiveModelAdapter = function () {
return usingAdapterType('ActiveModelAdapter');
return usingAdapterType('active-model');
};
var usingRESTAdapter = function () {
return usingAdapterType('RESTAdapter');
return usingAdapterType('rest');
};
/**
Return appropriate FixtureBuilder for the adapter type
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -28,11 +28,11 @@
],
"dependencies": {
"jquery-mockjax": "2.0.1",
"ember-data": "1.13.8"
"ember-data": "^2.0.0"
},
"devDependencies": {
"jquery": "^2.1.0",
"ember": "1.13.8",
"ember": "2.0.1",
"handlebars": "~1.3.0",
"ember-resolver": "~0.1.14",
"loader.js": "ember-cli/loader.js#3.2.0",
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-data-factory-guy",
"version": "1.13.10",
"version": "2.0.0",
"description": "Factories for testing Ember applications using EmberData",
"directories": {
"doc": "doc",
@@ -23,7 +23,7 @@
"license": "MIT",
"dependencies": {},
"devDependencies": {
"active-model-adapter": "^1.13.5",
"active-model-adapter": "^2.0.0",
"broccoli-asset-rev": "^2.0.2",
"ember-cli": "^1.13.8",
"ember-cli-app-version": "0.3.3",