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.

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

Store acceptance test application in test context. #4478

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
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@ import Ember from 'ember';
import { module, test } from 'qunit';
import startApp from '<%= testFolderRoot %>/tests/helpers/start-app';

var application;

module('<%= friendlyTestName %>', {
beforeEach: function() {
application = startApp();
this.application = startApp();
},

afterEach: function() {
Ember.run(application, 'destroy');
Ember.run(this.application, 'destroy');
}
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@ import Ember from 'ember';
import startApp from '../helpers/start-app';
import { module, test } from 'qunit';

var application;

module('Acceptance', {
beforeEach: function() {
application = startApp();
this.application = startApp();
},
afterEach: function() {
Ember.run(application, 'destroy');
Ember.run(this.application, 'destroy');
}
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@ import Ember from 'ember';
import startApp from '../helpers/start-app';
import { module, test } from 'qunit';

var application;

module('default-development - Integration', {
beforeEach: function() {
application = startApp();
this.application = startApp();
},
afterEach: function() {
Ember.run(application, 'destroy');
Ember.run(this.application, 'destroy');
}
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@ import Ember from 'ember';
import startApp from '../helpers/start-app';
import { module, test } from 'qunit';

var application;

module('pods based templates', {
beforeEach: function() {
application = startApp();
this.application = startApp();
},
afterEach: function() {
Ember.run(application, 'destroy');
Ember.run(this.application, 'destroy');
}
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@ import Ember from 'ember';
import startApp from '../helpers/start-app';
import { module, test } from 'qunit';

var application;

module('pods based templates', {
beforeEach: function() {
application = startApp();
this.application = startApp();
},
afterEach: function() {
Ember.run(application, 'destroy');
Ember.run(this.application, 'destroy');
}
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@ import Ember from 'ember';
import startApp from '../helpers/start-app';
import { module, test } from 'qunit';

var application;

module('wrapInEval in-app test', {
beforeEach: function() {
application = startApp();
this.application = startApp();
},
afterEach: function() {
Ember.run(application, 'destroy');
Ember.run(this.application, 'destroy');
}
});

Expand Down
6 changes: 2 additions & 4 deletions tests/fixtures/generate/acceptance-test-expected.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@ import Ember from 'ember';
import { module, test } from 'qunit';
import startApp from 'my-app/tests/helpers/start-app';

var application;

module('Acceptance | foo', {
beforeEach: function() {
application = startApp();
this.application = startApp();
},

afterEach: function() {
Ember.run(application, 'destroy');
Ember.run(this.application, 'destroy');
}
});

Expand Down
6 changes: 2 additions & 4 deletions tests/fixtures/generate/addon-acceptance-test-expected.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@ import Ember from 'ember';
import { module, test } from 'qunit';
import startApp from '../../tests/helpers/start-app';

var application;

module('Acceptance | foo', {
beforeEach: function() {
application = startApp();
this.application = startApp();
},

afterEach: function() {
Ember.run(application, 'destroy');
Ember.run(this.application, 'destroy');
}
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@ import Ember from 'ember';
import { module, test } from 'qunit';
import startApp from '../../../tests/helpers/start-app';

var application;

module('Acceptance | foo/bar', {
beforeEach: function() {
application = startApp();
this.application = startApp();
},

afterEach: function() {
Ember.run(application, 'destroy');
Ember.run(this.application, 'destroy');
}
});

Expand Down