Skip to content
This repository has been archived by the owner on Nov 28, 2022. It is now read-only.

Commit

Permalink
deps: ember-source@2.12.0
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinansfield committed Mar 29, 2017
1 parent 61e73b4 commit 3c84804
Show file tree
Hide file tree
Showing 24 changed files with 122 additions and 48 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,12 @@
"ember-one-way-controls": "2.0.0",
"ember-power-select": "1.5.0",
"ember-resolver": "3.0.0",
"ember-responsive": "2.0.2",
"ember-route-action-helper": "2.0.2",
"ember-simple-auth": "1.2.0",
"ember-sinon": "0.6.0",
"ember-sortable": "1.9.1",
"ember-source": "2.11.2",
"ember-source": "2.12.0",
"ember-test-selectors": "0.2.1",
"ember-truth-helpers": "1.3.0",
"ember-wormhole": "0.5.1",
Expand Down
17 changes: 10 additions & 7 deletions tests/integration/components/gh-navigation-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import hbs from 'htmlbars-inline-precompile';
import $ from 'jquery';
import run from 'ember-runloop';
import NavItem from 'ghost-admin/models/navigation-item';
import wait from 'ember-test-helpers/wait';

describe('Integration: Component: gh-navigation', function () {
setupComponentTest('gh-navigation', {
Expand Down Expand Up @@ -59,13 +60,15 @@ describe('Integration: Component: gh-navigation', function () {
});
});

// move second item down one
expectedOldIndex = 1;
expectedNewIndex = 2;
run(() => {
$(this.$('.gh-blognav-item')[1]).simulateDragSortable({
move: 1,
handle: '.gh-blognav-grab'
wait().then(() => {
// move second item down one
expectedOldIndex = 1;
expectedNewIndex = 2;
run(() => {
$(this.$('.gh-blognav-item')[1]).simulateDragSortable({
move: 1,
handle: '.gh-blognav-grab'
});
});
});
});
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/components/gh-alert-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import sinon from 'sinon';

describe('Unit: Component: gh-alert', function () {
setupComponentTest('gh-alert', {
unit: true
unit: true,
// specify the other units that are required for this test
// needs: ['component:foo', 'helper:bar']
needs: ['service:notifications']
});

it('closes notification through notifications service', function () {
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/components/gh-notification-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import sinon from 'sinon';

describe('Unit: Component: gh-notification', function () {
setupComponentTest('gh-notification', {
unit: true
unit: true,
// specify the other units that are required for this test
// needs: ['component:foo', 'helper:bar']
needs: ['service:notifications']
});

it('closes notification through notifications service', function () {
Expand Down
5 changes: 3 additions & 2 deletions tests/unit/components/gh-upgrade-notification-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ import {expect} from 'chai';
import {describe, it} from 'mocha';
import {setupComponentTest} from 'ember-mocha';

describe('GhUpgradeNotificationComponent', function() {
describe('Unit: Component: gh-upgrade-notification', function() {
setupComponentTest('gh-upgrade-notification', {
needs: ['helper:gh-format-html']
unit: true,
needs: ['helper:gh-format-html', 'service:upgrade-notification']
});

beforeEach(function() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import {setupComponentTest} from 'ember-mocha';

describe('Unit: Component: gh-url-preview', function () {
setupComponentTest('gh-url-preview', {
unit: true
unit: true,
needs: ['service:config']
});

it('generates the correct preview URL with a prefix', function () {
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/components/gh-user-active-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import {setupComponentTest} from 'ember-mocha';

describe('Unit: Component: gh-user-active', function () {
setupComponentTest('gh-user-active', {
unit: true
unit: true,
// specify the other units that are required for this test
// needs: ['component:foo', 'helper:bar']
needs: ['service:ghostPaths']
});

it('renders', function () {
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/components/gh-user-invited-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import {setupComponentTest} from 'ember-mocha';

describe('Unit: Component: gh-user-invited', function () {
setupComponentTest('gh-user-invited', {
unit: true
unit: true,
// specify the other units that are required for this test
// needs: ['component:foo', 'helper:bar']
needs: ['service:notifications']
});

it('renders', function () {
Expand Down
5 changes: 3 additions & 2 deletions tests/unit/controllers/settings/design-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@ describe('Unit: Controller: settings/design', function () {
setupTest('controller:settings/design', {
// Specify the other units that are required for this test.
needs: [
'service:config',
'service:notifications',
'model:navigation-item',
'service:ajax',
'service:config',
'service:ghostPaths',
'service:notifications',
'service:session',
'service:upgrade-status'
]
});
Expand Down
7 changes: 6 additions & 1 deletion tests/unit/controllers/settings/general-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ const {

describe('Unit: Controller: settings/general', function () {
setupTest('controller:settings/general', {
needs: ['service:notifications']
needs: [
'service:config',
'service:ghostPaths',
'service:notifications',
'service:session'
]
});

it('isDatedPermalinks should be correct', function () {
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/controllers/subscribers-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {setupTest} from 'ember-mocha';

describe('Unit: Controller: subscribers', function() {
setupTest('controller:subscribers', {
needs: ['service:notifications']
needs: ['service:notifications', 'service:session']
});

// Replace this with your real tests.
Expand Down
11 changes: 10 additions & 1 deletion tests/unit/models/post-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,16 @@ import {setupModelTest} from 'ember-mocha';

describe('Unit: Model: post', function () {
setupModelTest('post', {
needs: ['model:user', 'model:tag', 'model:role']
needs: [
'model:user',
'model:tag',
'model:role',
'service:clock',
'service:config',
'service:feature',
'service:ghostPaths',
'service:session'
]
});

it('has a validation type of "post"', function () {
Expand Down
5 changes: 4 additions & 1 deletion tests/unit/models/role-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ import {describe, it} from 'mocha';
import {setupModelTest} from 'ember-mocha';

describe('Unit: Model: role', function () {
setupModelTest('role');
setupModelTest('role', {
needs: ['service:ajax']
});

it('provides a lowercase version of the name', function () {
let model = this.subject({
name: 'Author'
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/models/subscriber-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {setupModelTest} from 'ember-mocha';
describe('Unit: Model: subscriber', function() {
setupModelTest('subscriber', {
// Specify the other units that are required for this test.
needs: ['model:post']
needs: ['model:post', 'service:session']
});

// Replace this with your real tests.
Expand Down
7 changes: 6 additions & 1 deletion tests/unit/models/tag-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@ import {describe, it} from 'mocha';
import {setupModelTest} from 'ember-mocha';

describe('Unit: Model: tag', function () {
setupModelTest('tag');
setupModelTest('tag', {
needs: [
'service:feature'
]
});

it('has a validation type of "tag"', function () {
let model = this.subject();

Expand Down
10 changes: 9 additions & 1 deletion tests/unit/models/user-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,15 @@ import {setupModelTest} from 'ember-mocha';

describe('Unit: Model: user', function () {
setupModelTest('user', {
needs: ['model:role', 'serializer:application', 'serializer:user']
needs: [
'model:role',
'serializer:application',
'serializer:user',
'service:ajax',
'service:ghostPaths',
'service:notifications',
'service:session'
]
});

it('has a validation type of "user"', function () {
Expand Down
6 changes: 5 additions & 1 deletion tests/unit/routes/subscribers-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ import {setupTest} from 'ember-mocha';

describe('Unit: Route: subscribers', function() {
setupTest('route:subscribers', {
needs: ['service:notifications']
needs: [
'service:feature',
'service:notifications',
'service:session'
]
});

it('exists', function() {
Expand Down
12 changes: 10 additions & 2 deletions tests/unit/serializers/post-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,18 @@ import {expect} from 'chai';
import {describe, it} from 'mocha';
import {setupModelTest} from 'ember-mocha';

describe('Unit:Serializer: post', function() {
describe('Unit: Serializer: post', function() {
setupModelTest('post', {
// Specify the other units that are required for this test.
needs: ['transform:moment-utc', 'transform:json-string', 'model:user', 'model:tag']
needs: [
'transform:moment-utc',
'transform:json-string',
'model:user',
'model:tag',
'service:clock',
'service:config',
'service:ghostPaths'
]
});

// Replace this with your real tests.
Expand Down
8 changes: 6 additions & 2 deletions tests/unit/serializers/tag-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,14 @@ import {expect} from 'chai';
import {describe, it} from 'mocha';
import {setupModelTest} from 'ember-mocha';

describe('Unit:Serializer: tag', function() {
describe('Unit: Serializer: tag', function() {
setupModelTest('tag', {
// Specify the other units that are required for this test.
needs: ['transform:moment-utc', 'transform:raw']
needs: [
'service:feature',
'transform:moment-utc',
'transform:raw'
]
});

// Replace this with your real tests.
Expand Down
12 changes: 8 additions & 4 deletions tests/unit/serializers/user-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,19 @@ import {expect} from 'chai';
import {describe, it} from 'mocha';
import {setupModelTest} from 'ember-mocha';

describe('Unit:Serializer: user', function() {
describe('Unit: Serializer: user', function() {
setupModelTest('user', {
// Specify the other units that are required for this test.
needs: [
'model:role',
'service:ajax',
'service:ghostPaths',
'service:notifications',
'service:session',
'transform:facebook-url-user',
'transform:moment-utc',
'transform:raw',
'transform:facebook-url-user',
'transform:twitter-url-user',
'model:role'
'transform:twitter-url-user'
]
});

Expand Down
8 changes: 7 additions & 1 deletion tests/unit/services/config-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ import {describe, it} from 'mocha';
import {setupTest} from 'ember-mocha';

describe('Unit: Service: config', function () {
setupTest('service:config', {});
setupTest('service:config', {
needs: [
'service:ajax',
'service:ghostPaths'
]
});

// Replace this with your real tests.
it('exists', function () {
let service = this.subject();
Expand Down
5 changes: 4 additions & 1 deletion tests/unit/services/notifications-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ import {AjaxError, InvalidError} from 'ember-ajax/errors';
import {ServerUnreachableError} from 'ghost-admin/services/ajax';

describe('Unit: Service: notifications', function () {
setupTest('service:notifications', {});
setupTest('service:notifications', {
needs: ['service:upgradeStatus']
});

beforeEach(function () {
this.subject().set('content', emberA());
this.subject().set('delayedNotifications', emberA());
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/services/upgrade-status-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import {expect} from 'chai';
import {describe, it} from 'mocha';
import {setupTest} from 'ember-mocha';

describe('UpgradeStatusService', function() {
describe('Unit: Service: upgrade-status', function() {
setupTest('service:upgrade-status', {
// Specify the other units that are required for this test.
// needs: ['service:foo']
needs: []
needs: ['service:notifications']
});

// Replace this with your real tests.
Expand Down
22 changes: 15 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1290,7 +1290,7 @@ broccoli-merge-trees@2.0.0:
broccoli-plugin "^1.3.0"
merge-trees "^1.0.1"

broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.0, broccoli-merge-trees@^1.1.1, broccoli-merge-trees@^1.1.3, broccoli-merge-trees@^1.1.5, broccoli-merge-trees@^1.2.1:
broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.0, broccoli-merge-trees@^1.1.1, broccoli-merge-trees@^1.1.3, broccoli-merge-trees@^1.1.4, broccoli-merge-trees@^1.1.5, broccoli-merge-trees@^1.2.1:
version "1.2.4"
resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-1.2.4.tgz#a001519bb5067f06589d91afa2942445a2d0fdb5"
dependencies:
Expand Down Expand Up @@ -2936,6 +2936,13 @@ ember-resolver@3.0.0:
ember-cli-babel "^5.1.6"
ember-cli-version-checker "^1.1.6"

ember-responsive@2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/ember-responsive/-/ember-responsive-2.0.2.tgz#9d26d5cde87a535d88a7e7bd61caf0b8ff11e025"
dependencies:
ember-cli-babel "^5.1.6"
ember-getowner-polyfill "^1.1.1"

ember-route-action-helper@2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/ember-route-action-helper/-/ember-route-action-helper-2.0.2.tgz#6ca3f6189062f657c0c7a447e0ba12362152790f"
Expand Down Expand Up @@ -2996,11 +3003,12 @@ ember-sortable@1.9.1:
ember-invoke-action "^1.4.0"
ember-new-computed "^1.0.2"

ember-source@2.11.2:
version "2.11.2"
resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-2.11.2.tgz#07239925dc8fc2a8377bdf43210c42093e8fc4ae"
ember-source@2.12.0:
version "2.12.0"
resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-2.12.0.tgz#5c7d09765a5c2c071382f3c02cf28b34d450e4ef"
dependencies:
broccoli-stew "^1.2.0"
broccoli-funnel "^1.0.6"
broccoli-merge-trees "^1.1.4"
ember-cli-get-component-path-option "^1.0.0"
ember-cli-normalize-entity-name "^1.0.0"
ember-cli-path-utils "^1.0.0"
Expand All @@ -3010,7 +3018,7 @@ ember-source@2.11.2:
ember-cli-version-checker "^1.1.7"
jquery "^3.1.1"
resolve "^1.1.7"
rsvp "^3.3.3"
rsvp "^3.4.0"
simple-dom "^0.3.0"

ember-test-helpers@^0.6.0-beta.1:
Expand Down Expand Up @@ -6380,7 +6388,7 @@ route-recognizer@^0.2.3:
version "0.2.10"
resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.2.10.tgz#024b2283c2e68d13a7c7f5173a5924645e8902df"

rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.2.1, rsvp@^3.3.3:
rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.2.1, rsvp@^3.3.3, rsvp@^3.4.0:
version "3.4.0"
resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.4.0.tgz#96f397d9c7e294351b3c1456a74b3d0e7542988d"

Expand Down

0 comments on commit 3c84804

Please sign in to comment.