Skip to content
This repository was archived by the owner on Jan 22, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
# misc
/.sass-cache
/connect.lock
/coverage/*
/libpeerconnection.log
npm-debug.log
npm-debug.log*
testem.log
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,21 @@ cache:
- node_modules

env:
- EMBER_TRY_SCENARIO=default
# - EMBER_TRY_SCENARIO=default
# we recommend testing LTS's and latest stable release (bonus points to beta/canary)
- EMBER_TRY_SCENARIO=ember-1.13
- EMBER_TRY_SCENARIO=ember-lts-2.4
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
- EMBER_TRY_SCENARIO=ember-2.0.3
- EMBER_TRY_SCENARIO=ember-2.1.2
- EMBER_TRY_SCENARIO=ember-2.2.2
- EMBER_TRY_SCENARIO=ember-2.3.1
- EMBER_TRY_SCENARIO=ember-2.4.6-LTS
- EMBER_TRY_SCENARIO=ember-2.5.1
- EMBER_TRY_SCENARIO=ember-2.6.2
- EMBER_TRY_SCENARIO=ember-2.7.3
- EMBER_TRY_SCENARIO=ember-2.8.2

matrix:
fast_finish: true
Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "ember-jsonapi-resources",
"dependencies": {
"ember": "~2.8.1",
"ember-cli-shims": "0.1.1",
"ember": "~2.9.0",
"ember-cli-shims": "0.1.3",
"fetch": "~0.10.1",
"es6-promise": "^4.0.5"
},
Expand Down
37 changes: 21 additions & 16 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
module.exports = {
scenarios: [
{
name: 'default',
name: 'ember-1.13',
bower: {
dependencies: { }
dependencies: {
'ember': '~1.13.0'
},
resolutions: {
'ember': '~1.13.0'
}
}
},
{
name: 'ember-1.13',
name: 'ember-lts-2.4',
bower: {
dependencies: {
'ember': '~1.13.0'
'ember': 'components/ember#lts-2-4'
},
resolutions: {
'ember': '~1.13.0'
'ember': 'lts-2-4'
}
}
},
Expand Down Expand Up @@ -89,17 +94,6 @@ module.exports = {
}
}
},
{
name: 'ember-2.4.6-LTS',
bower: {
dependencies: {
'ember': '2.4.6'
},
resolutions: {
'ember': '2.4.6'
}
}
},
{
name: 'ember-2.5.1',
bower: {
Expand Down Expand Up @@ -132,6 +126,17 @@ module.exports = {
'ember': '2.7.3'
}
}
},
{
name: 'ember-2.8.2',
bower: {
dependencies: {
'ember': '2.8.2'
},
resolutions: {
'ember': '2.8.2'
}
}
}
]
};
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,24 @@
"author": "Bill Heaton <pixelhandler@gmail.com>",
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.4.2",
"broccoli-asset-rev": "^2.4.5",
"broccoli-es6-concatenator": "^0.1.11",
"broccoli-filter": "^0.1.14",
"broccoli-static-compiler": "^0.2.1",
"ember-ajax": "^2.0.1",
"ember-ajax": "^2.4.1",
"ember-buffered-proxy": "^0.5.1",
"ember-cli": "2.8.0",
"ember-cli-app-version": "^1.0.0",
"ember-cli": "2.9.1",
"ember-cli-app-version": "^2.0.0",
"ember-cli-blueprint-test-helpers": "^0.13.0",
"ember-cli-content-security-policy": "0.4.0",
"ember-cli-dependency-checker": "^1.2.0",
"ember-cli-dependency-checker": "^1.3.0",
"ember-cli-get-dependency-depth": "^1.0.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-htmlbars": "^1.0.10",
"ember-cli-htmlbars-inline-precompile": "^0.3.3",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-jshint": "^1.0.4",
"ember-cli-path-utils": "^1.0.0",
"ember-cli-qunit": "^2.1.0",
"ember-cli-qunit": "^3.0.1",
"ember-cli-release": "^0.2.9",
"ember-cli-sri": "^2.1.0",
"ember-cli-string-utils": "^1.0.0",
Expand All @@ -47,10 +47,10 @@
"ember-export-application-global": "^1.0.5",
"ember-load-initializers": "^0.5.1",
"ember-resolver": "^2.0.3",
"ember-welcome-page": "^1.0.1",
"ember-welcome-page": "^1.0.3",
"glob": "^4.5.3",
"http-proxy": "^1.12.0",
"loader.js": "^4.0.1",
"loader.js": "^4.0.10",
"mocha": "^2.5.3",
"morgan": "^1.6.1",
"silent-error": "^1.0.0",
Expand All @@ -63,7 +63,7 @@
"jsonapi"
],
"dependencies": {
"ember-cli-babel": "^5.1.6",
"ember-cli-babel": "^5.1.7",
"ember-inflector": "^1.9.1",
"inflection": "~1.7.1",
"lodash": "~3.10.1"
Expand Down
6 changes: 5 additions & 1 deletion tests/dummy/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ module.exports = function(environment) {
// Here you can enable experimental features on an ember canary build
// e.g. 'with-controller': true
},
MODEL_FACTORY_INJECTIONS: true
MODEL_FACTORY_INJECTIONS: true,
EXTEND_PROTOTYPES: {
// Prevent Ember Data from overriding Date.parse.
Date: false
}
},

APP: {
Expand Down
4 changes: 2 additions & 2 deletions tests/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
{{content-for "test-head-footer"}}
</head>
<body>

{{content-for "body"}}
{{content-for "test-body"}}
<script src="{{rootURL}}testem.js" integrity=""></script>

<script src="/testem.js" integrity=""></script>
<script src="{{rootURL}}assets/vendor.js"></script>
<script src="{{rootURL}}assets/test-support.js"></script>
<script src="{{rootURL}}assets/dummy.js"></script>
Expand Down
Loading