Skip to content

Commit 8d4f767

Browse files
committed
3.0.0-alpha.3
2 parents 92e4052 + 706c615 commit 8d4f767

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

CONTRIBUTORS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
#
55
# Names should be added to this file as:
66
# [commit count] Name <email address>
7-
59 Jason Dobry <[email protected]>
7+
60 Jason Dobry <[email protected]>

karma.conf.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ module.exports = function (config) {
6060
'node_modules/babel-polyfill/dist/polyfill.js',
6161
'node_modules/js-data/dist/js-data.js',
6262
'dist/js-data-localstorage.js',
63+
'karma.prestart.js',
6364
'node_modules/js-data-adapter-tests/dist/js-data-adapter-tests.js',
6465
'karma.start.js'
6566
],

karma.prestart.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
window.assert = chai.assert

karma.start.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ beforeEach(function () {
22
localStorage.clear()
33
})
44

5-
window.assert = TestRunner.assert
6-
75
TestRunner.init({
6+
debug: false,
87
features: [],
98
JSData: JSData,
109
Adapter: LocalStorageAdapter,
@@ -14,7 +13,8 @@ TestRunner.init({
1413
})
1514

1615
describe('relation functionality', function () {
17-
it('nested create', function () {
16+
// will be available in js-data 3.0.0-alpha.15
17+
it.skip('nested create', function () {
1818
return this.$$container.create('user', {
1919
name: 'John',
2020
profile: {
@@ -29,7 +29,7 @@ describe('relation functionality', function () {
2929
}
3030
]
3131
}, { with: ['profile', 'post', 'organization'] }).then(function (user) {
32-
// console.log(JSON.stringify(user, null, 2))
32+
console.log(JSON.stringify(user, null, 2))
3333
assert.isDefined(user)
3434
assert.isDefined(user.id)
3535
assert.isDefined(user.organization)

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"karma-phantomjs-launcher": "1.0.0",
7272
"mocha": "2.4.5",
7373
"mout": "0.11.1",
74-
"phantomjs-prebuilt": "^2.1.4",
74+
"phantomjs-prebuilt": "2.1.4",
7575
"standard": "6.0.7",
7676
"uglify-js": "2.6.2",
7777
"webpack": "1.12.14"

0 commit comments

Comments
 (0)