Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[fixed] Strict mode error #29

Merged
merged 11 commits into from
Sep 14, 2015
Merged

[fixed] Strict mode error #29

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a024ab4
[fixed] Strict mode error
grncdr Sep 1, 2015
a0e9196
[fixed] Properly require es6-promise
grncdr Sep 1, 2015
c9c0c63
[fixed] Rate-limit code was swallowing results
grncdr Sep 2, 2015
a0c77a6
[fixed] examples/clone-space.js assumed Bluebird
grncdr Sep 2, 2015
5e21191
[fixed] added a missing 'use strict'
grncdr Sep 2, 2015
97b9810
[Fixed] Integration tests were using an invalid Organization ID
grncdr Sep 11, 2015
0f3be3f
Remove old secure vars from .travis.yml
grncdr Sep 11, 2015
ed6d230
[Changed] Use container-based travis builds
grncdr Sep 11, 2015
5fc5ac3
[Removed] geckoboard notifications
grncdr Sep 11, 2015
1dba495
[Removed] Don't force old version of npm
grncdr Sep 11, 2015
763535c
[Changed] don't use testem for CI
grncdr Sep 11, 2015
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
Prev Previous commit
Next Next commit
[Fixed] Integration tests were using an invalid Organization ID
  • Loading branch information
@grncdr
grncdr committed Sep 11, 2015
commit 97b9810bcd1e50733c864c5a8284c281dca76413
2 changes: 1 addition & 1 deletion lib/wait.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ var Promise = require('es6-promise').Promise;

module.exports = function (ms) {
return new Promise(function (resolve, reject) {
setTimeout(resolve, ms);
setTimeout(resolve, ms || 3000);
});
}
2 changes: 1 addition & 1 deletion test/integration/asset-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buster.testCase('Asset', {
var that = this;
return client.createSpace({
name: 'Asset Integration Test'
}, 'contentful').then(function(space) {
}, process.env.CONTENTFUL_ORGANIZATION_ID).then(function(space) {
that.space = space;
});
},
Expand Down
2 changes: 1 addition & 1 deletion test/integration/content-type-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buster.testCase('Content Type', {
var that = this;
return client.createSpace({
name: 'Content Type Integration Test'
}, 'contentful').then(function(space) {
}, process.env.CONTENTFUL_ORGANIZATION_ID).then(function(space) {
that.space = space;
});
},
Expand Down
2 changes: 1 addition & 1 deletion test/integration/entry-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buster.testCase('Entry', {
var that = this;
return client.createSpace({
name: 'Entry Integration Test'
}, 'contentful').then(function(space) {
}, process.env.CONTENTFUL_ORGANIZATION_ID).then(function(space) {
that.space = space;
return space.createContentType({
name: 'Recipe',
Expand Down
4 changes: 2 additions & 2 deletions test/integration/space-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buster.testCase('Space', {
var that = this;
return client.createSpace({
name: 'Space Integration Test'
}, 'contentful').then(function(space) {
}, process.env.CONTENTFUL_ORGANIZATION_ID).then(function(space) {
that.space = space;
});
},
Expand Down Expand Up @@ -49,7 +49,7 @@ buster.testCase('Space', {
'can be deleted': function() {
return client.createSpace({
name: 'Space Integration Test'
}, 'contentful').then(function(space) {
}, process.env.CONTENTFUL_ORGANIZATION_ID).then(function(space) {
assert(true);
return client.deleteSpace(space);
});
Expand Down