Skip to content

Commit c7d9b0f

Browse files
makempmakemp
committed
test are running but failing badly
1 parent 594f93c commit c7d9b0f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1599
-3291
lines changed

‎.eslintrc.js

-1
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,6 @@ module.exports = {
351351
triggerCopyError: true,
352352
signInUser: true,
353353
withFeature: true,
354-
percySnapshot: true,
355354
waitForElement: true
356355
},
357356
plugins: ['node'],

‎app/adapters/build.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import V3Adapter from 'travis/adapters/v3';
2-
import Ember from 'ember';
2+
import { testing } from 'ember';
33

44
let includes = 'build.commit,build.branch,build.request,build.created_by';
55

66
// TODO this is a workaround for an infinite loop in Mirage serialising 😞
7-
if (!Ember.testing) {
7+
if (testing) {
88
includes += ',build.repository';
99
}
1010

‎app/app.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* global Travis */
22
import Evented from '@ember/object/evented';
3-
3+
import Ember from 'ember';
44
import Application from '@ember/application';
55
import Resolver from './resolver';
66
import loadInitializers from 'ember-load-initializers';

‎app/components/broadcast-tower.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { later } from '@ember/runloop';
22
import { Promise as EmberPromise } from 'rsvp';
33
import Component from '@ember/component';
4-
import Ember from 'ember';
4+
import {testing} from 'ember';
55
import { task } from 'ember-concurrency';
66

77
export default Component.extend({
@@ -16,7 +16,7 @@ export default Component.extend({
1616
this.toggleBroadcasts();
1717

1818
// Acceptance tests will wait for the promise to resolve, so skip in tests
19-
if (this.isOpen && !Ember.testing) {
19+
if (this.isOpen && !testing) {
2020
yield new EmberPromise(resolve => later(resolve, 10000));
2121

2222
this.toggleProperty('isOpen');

‎app/components/build-message.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import { and, notEmpty } from '@ember/object/computed';
55
import { htmlSafe } from '@ember/string';
66
import { typeOf } from '@ember/utils';
77
import { codeblockName } from 'travis/utils/format-config';
8-
import Ember from 'ember';
8+
import { Handlebars } from 'ember';
99

10-
const { escapeExpression: escape } = Ember.Handlebars.Utils;
10+
const { Utils: { escapeExpression: escape } } = Handlebars;
1111

1212
export default Component.extend({
1313
tagName: '',

‎app/components/queued-jobs.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Component from '@ember/component';
2-
import Ember from 'ember';
2+
import {testing} from 'ember';
33
import { reads } from '@ember/object/computed';
44
import config from 'travis/config/environment';
55
import Visibility from 'visibilityjs';
@@ -13,7 +13,7 @@ export default Component.extend({
1313

1414
init() {
1515
this._super(...arguments);
16-
if (!Ember.testing) {
16+
if (!testing) {
1717
return Visibility.every(config.intervals.updateTimes, this.updateTimes.bind(this));
1818
}
1919
},

‎app/components/repository-sidebar.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { isEmpty } from '@ember/utils';
22
import { schedule } from '@ember/runloop';
33
import Component from '@ember/component';
4-
import Ember from 'ember';
4+
import {testing} from 'ember';
55
import Visibility from 'visibilityjs';
66
import { task } from 'ember-concurrency';
77
import { computed } from '@ember/object';
@@ -42,7 +42,7 @@ export default Component.extend({
4242
this.set('_data', this.get('repositories.accessible'));
4343
}
4444

45-
if (!Ember.testing) {
45+
if (!testing) {
4646
Visibility.every(config.intervals.updateTimes, () => {
4747
const callback = (record) => record.get('currentBuild');
4848
const withCurrentBuild = this._data.filter(callback).map(callback);

‎app/components/running-jobs.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Component from '@ember/component';
2-
import Ember from 'ember';
2+
import {testing} from 'ember';
33
import { reads } from '@ember/object/computed';
44
import config from 'travis/config/environment';
55
import Visibility from 'visibilityjs';
@@ -13,7 +13,7 @@ export default Component.extend({
1313

1414
init() {
1515
this._super(...arguments);
16-
if (!Ember.testing) {
16+
if (!testing) {
1717
return Visibility.every(config.intervals.updateTimes, this.updateTimes.bind(this));
1818
}
1919
},

‎app/components/top-bar.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { scheduleOnce } from '@ember/runloop';
22
import Component from '@ember/component';
3-
import Ember from 'ember';
3+
import {testing} from 'ember';
44
import {
55
computed,
66
setProperties,
@@ -84,7 +84,7 @@ export default class TopBar extends Component {
8484
}
8585

8686
didInsertElement() {
87-
if (Ember.testing) {
87+
if (testing) {
8888
super.didInsertElement(...arguments);
8989
return;
9090
}

‎app/controllers/build.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Controller, { inject as controller } from '@ember/controller';
2-
import Ember from 'ember';
2+
import {testing} from 'ember';
33
import Polling from 'travis/mixins/polling';
44
import Visibility from 'visibilityjs';
55
import config from 'travis/config/environment';
@@ -28,7 +28,7 @@ export default Controller.extend(Polling, {
2828

2929
init() {
3030
this._super(...arguments);
31-
if (!Ember.testing) {
31+
if (!testing) {
3232
return Visibility.every(config.intervals.updateTimes, this.updateTimes.bind(this));
3333
}
3434
},

‎app/controllers/dashboard/builds.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Controller from '@ember/controller';
2-
import Ember from 'ember';
2+
import {testing} from 'ember';
33
import Visibility from 'visibilityjs';
44
import { inject as service } from '@ember/service';
55
import config from 'travis/config/environment';
@@ -9,7 +9,7 @@ export default Controller.extend({
99

1010
init() {
1111
this._super(...arguments);
12-
if (!Ember.testing) {
12+
if (!testing) {
1313
Visibility.every(config.intervals.updateTimes, this.updateTimes.bind(this));
1414
}
1515
},

‎app/controllers/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Controller from '@ember/controller';
2-
import Ember from 'ember';
2+
import {testing} from 'ember';
33
import { computed } from '@ember/object';
44
import { alias } from '@ember/object/computed';
55
import Visibility from 'visibilityjs';
@@ -18,7 +18,7 @@ export default Controller.extend({
1818

1919
init() {
2020
this._super(...arguments);
21-
if (!Ember.testing) {
21+
if (!testing) {
2222
return Visibility.every(config.intervals.updateTimes, this.updateTimes.bind(this));
2323
}
2424
},

‎app/controllers/repo.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { scheduleOnce } from '@ember/runloop';
22
import { isEmpty } from '@ember/utils';
33
import Controller, { inject as controller } from '@ember/controller';
4-
import Ember from 'ember';
4+
import {testing} from 'ember';
55
import eventually from 'travis/utils/eventually';
66
import Visibility from 'visibilityjs';
77
import { inject as service } from '@ember/service';
@@ -63,7 +63,7 @@ export default Controller.extend({
6363

6464
init() {
6565
this._super(...arguments);
66-
if (!Ember.testing) {
66+
if (!testing) {
6767
Visibility.every(config.intervals.updateTimes, this.updateTimes.bind(this));
6868
}
6969
},

‎app/helpers/commit-link.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import Ember from 'ember';
1+
import { Handlebars } from 'ember';
22
import { htmlSafe } from '@ember/string';
33
import Helper from '@ember/component/helper';
44
import { inject as service } from '@ember/service';
55
import formatCommit from 'travis/utils/format-commit';
66

7-
const { escapeExpression: escape } = Ember.Handlebars.Utils;
7+
const { Utils: { escapeExpression: escape } } = Handlebars;
88

99
export default Helper.extend({
1010
externalLinks: service(),

‎app/services/animation.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import Service from '@ember/service';
22
import { computed } from '@ember/object';
3-
import Ember from 'ember';
3+
import {testing} from 'ember';
44
import fade from 'ember-animated/transitions/fade';
55

6-
const isTest = Ember.testing;
6+
const isTest = testing;
77

88
export const DURATION_NAMES = {
99
QUICK: 'quick',

‎app/templates/account-error.hbs

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@
1616
If you believe you've received this message in error, please
1717
<LinkTo @route="help" @query={{hash anchor="form"}}>
1818
contact support.
19-
</LinkTo>
20-
</p>
19+
</LinkTo> </p>
2120
</div>

‎app/templates/account/settings.hbs

+1-2
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@
110110
@query={{hash tab="insights"}}
111111
>
112112
View {{this.account.fullName}}'s Insights
113-
</LinkTo>
114-
</p>
113+
</LinkTo> </p>
115114
<VisibilitySettingList
116115
@options={{this.insightsVisibilityOptions}}
117116
@initialKey={{this.privateInsightsVisibility}}

‎app/templates/application.hbs

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{head-layout}}
12
{{#let this.features as |f|}}
23
<HeadLayout />
34
<div class="feature-wrapper {{if f.dashboard 'dashboard'}} {{if f.pride 'travis-pride'}} {{if f.comicSans 'travis-comicsans'}}">

‎app/templates/components/email-unsubscribe.hbs

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434
class="repo-link repo-slug"
3535
>
3636
{{this.repo.formattedSlug}}
37-
</LinkTo>
38-
</h1>
37+
</LinkTo> </h1>
3938
<p class="description" data-test-email-unsubscribe-description>
4039
{{#if this.isSubscribed}}
4140
Please confirm that you would like to unsubscribe from build emails for the

‎app/templates/components/job-tabs.hbs

+2-4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
data-test-job-log-tab="true"
1111
>
1212
Job log
13-
</LinkTo>
14-
</li>
13+
</LinkTo> </li>
1514
<li>
1615
<LinkTo
1716
@route="job.config"
@@ -32,8 +31,7 @@
3231
<EmberTooltip @text={{this.messagesBadgeTooltipText}} />
3332
</span>
3433
{{/if}}
35-
</LinkTo>
36-
</li>
34+
</LinkTo> </li>
3735
</ul>
3836
</nav>
3937
<div class="travistab-body job-tabs">

‎app/templates/components/lastbuild-tile.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
<span class="label-align">
1212
#{{this.build.number}}
1313
</span>
14-
</LinkTo>
14+
</LinkTo

‎app/templates/components/link-to-account.hbs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{{#if this.routeModel}}
22
<LinkTo @route={{this.routeName}} @model={{this.routeModel}} class={{@class}}>
33
{{yield}}
4-
</LinkTo>
5-
{{else}}
4+
</LinkTo>{{else}}
65
<LinkTo @route={{this.routeName}} class={{@class}}>
76
{{yield}}
87
</LinkTo>

‎app/templates/components/plan_usage.hbs

+1-2
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@
113113
@query={{hash serverType=this.repo.serverType}}
114114
>
115115
{{repository.formattedSlug}}
116-
</LinkTo>
117-
</td>
116+
</LinkTo> </td>
118117
<td>
119118
{{format-number repository.buildMinutes}}
120119
</td>

‎app/templates/components/repo-show-tools.hbs

+3-6
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,17 @@
1616
<li>
1717
<LinkTo @route="settings" @model={{this.repo}}>
1818
Settings
19-
</LinkTo>
20-
</li>
19+
</LinkTo> </li>
2120
{{/if}}
2221
<li>
2322
<LinkTo @route="requests" @model={{this.repo}}>
2423
Requests
25-
</LinkTo>
26-
</li>
24+
</LinkTo> </li>
2725
{{#if this.displayCachesLink}}
2826
<li>
2927
<LinkTo @route="caches" @model={{this.repo}}>
3028
Caches
31-
</LinkTo>
32-
</li>
29+
</LinkTo> </li>
3330
{{/if}}
3431
{{#if (and this.displayTriggerBuildLink this.canOwnerBuild)}}
3532
<li>

‎app/templates/components/repository-layout.hbs

+2-4
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@
77
<h1 data-test-repo-header-title class="inline-block vertical-align">
88
<LinkTo @route="owner" @models={{array this.repo.provider this.repo.ownerName}} >
99
{{this.repo.owner.login}}
10-
</LinkTo>
11-
/
10+
</LinkTo> /
1211
<LinkTo
1312
@route="repo" @models={{array this.repo.provider this.repo.urlOwnerName this.repo.urlName}}
1413
@query={{hash serverType=this.repo.serverType}}
1514
>
1615
{{this.repo.name}}
17-
</LinkTo>
18-
</h1>
16+
</LinkTo> </h1>
1917
</div>
2018
<div>
2119
<ExternalLinkTo

‎app/templates/dashboard.hbs

+2-4
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,11 @@
2323
<h2 class="small-title">
2424
<LinkTo @route="dashboard.repositories" data-test-active-repos-tab="true">
2525
Active repositories
26-
</LinkTo>
27-
</h2>
26+
</LinkTo> </h2>
2827
<h2 class="small-title">
2928
<LinkTo @route="dashboard.builds" data-test-my-builds-tab="true">
3029
My builds
31-
</LinkTo>
32-
</h2>
30+
</LinkTo> </h2>
3331
</header>
3432
{{outlet}}
3533
</TravisLayout>

‎app/templates/owner/repositories.hbs

+2-4
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
<li>
44
<LinkTo @query={{hash tab="repositories" timeInterval=this.defaultTimeInterval}} >
55
Repositories
6-
</LinkTo>
7-
</li>
6+
</LinkTo> </li>
87
<li>
98
<LinkTo @query={{hash tab="insights" timeInterval=this.timeInterval page=1}}>
109
Insights
11-
</LinkTo>
12-
</li>
10+
</LinkTo> </li>
1311
</ul>
1412
</nav>
1513
<div class="owner-repo">

‎app/templates/settings.hbs

+2-4
Original file line numberDiff line numberDiff line change
@@ -317,17 +317,15 @@
317317
class="migrated-repo-settings-modal__button button--blue"
318318
>
319319
View Build History
320-
</LinkTo>
321-
<ExternalLinkTo
320+
</LinkTo> <ExternalLinkTo
322321
@href={{this.migratedRepositorySettingsLink}}
323322
class="migrated-repo-settings-modal__button button--dark-grey"
324323
>
325324
Edit settings on .com
326325
</ExternalLinkTo>
327326
<LinkTo @route="repo.index" @models={{array repo.provider repo.ownerName repo.vcsName}} class="modal-close pointer">
328327
<SvgImage @name="icon-failed" @class="icon" />
329-
</LinkTo>
330-
</div>
328+
</LinkTo> </div>
331329
</div>
332330
</Modal>
333331
<Dialogs::UserManagementModal

0 commit comments

Comments
 (0)