Skip to content

Commit 5309846

Browse files
committed
Try increasing timeouts for Travis
1 parent 97679dc commit 5309846

5 files changed

Lines changed: 15 additions & 5 deletions

File tree

app/serializers/gist.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export default ApplicationSerializer.extend({
1818
},
1919

2020
normalizeArrayResponse(store, primaryModelClass, payload) {
21-
payload.forEach((hash)=> this.normalizeGist(hash, true));
21+
payload.forEach(hash => this.normalizeGist(hash, true));
2222

2323
return this._super(...arguments);
2424
},

tests/acceptance/acceptance-application-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ test('An acceptance test for an application works', function(assert) {
160160
runGist(files);
161161

162162
andThen(function() {
163-
return timeout(250); // TODO: fix and remove this timing hack
163+
return timeout(500); // TODO: fix and remove this timing hack
164164
});
165165

166166
andThen(function() {

tests/acceptance/integration-component-test.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { test } from 'qunit';
22
import moduleForAcceptance from 'ember-twiddle/tests/helpers/module-for-acceptance';
3+
import { timeout } from 'ember-concurrency';
34

45
moduleForAcceptance('Acceptance | integration-component-test', {
56
beforeEach: function() {
@@ -112,6 +113,10 @@ test('An integration test for a component works', function(assert) {
112113

113114
runGist(files);
114115

116+
andThen(function() {
117+
return timeout(500); // TODO: fix and remove this timing hack
118+
});
119+
115120
andThen(function() {
116121
const outputSpan = 'div#qunit-testresult-display > span.passed';
117122

tests/acceptance/unit-controller-test.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { test } from 'qunit';
22
import moduleForAcceptance from 'ember-twiddle/tests/helpers/module-for-acceptance';
3+
import { timeout } from 'ember-concurrency';
34

45
moduleForAcceptance('Acceptance | unit-controller-test', {
56
beforeEach: function() {
@@ -86,6 +87,10 @@ test('A unit test for controllers works', function(assert) {
8687

8788
runGist(files);
8889

90+
andThen(function() {
91+
return timeout(250); // TODO: fix and remove this timing hack
92+
});
93+
8994
andThen(function() {
9095
const outputSpan = 'div#qunit-testresult-display > span.passed';
9196

tests/helpers/wait-for-loaded-iframe.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Ember from "ember";
22

3-
const { RSVP, run, warn } = Ember;
3+
const { RSVP, run } = Ember;
44

55
export default function(app, url) {
66
let iframeWindow;
@@ -18,7 +18,8 @@ export default function(app, url) {
1818
}
1919

2020
if (times++ >= 10) {
21-
warn('Timeout: Twiddle has failed to load');
21+
// eslint-disable-next-line no-console
22+
console.warn('Timeout: Twiddle has failed to load');
2223
run.cancelTimers();
2324
} else if (app.testHelpers.find('iframe#dummy-content-iframe').length === 0) {
2425
run.later(waitForRender, 10);
@@ -41,7 +42,6 @@ export default function(app, url) {
4142
url = url || "/";
4243

4344
if (times++ >= 10) {
44-
warn('Timeout: Twiddle has failed to load');
4545
run.cancelTimers();
4646
} else if (iframeWindow.visit) {
4747
return iframeWindow.visit(url);

0 commit comments

Comments
 (0)