Skip to content

Commit

Permalink
Merge pull request #1357 from code-corps/update-addons
Browse files Browse the repository at this point in the history
Update Ember addons en masse
  • Loading branch information
begedin committed Aug 29, 2017
2 parents fc6fb23 + 361620b commit 28b35bd
Show file tree
Hide file tree
Showing 4 changed files with 1,033 additions and 616 deletions.
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"broccoli-asset-rev": "^2.4.5",
"coveralls": "^2.11.14",
"ember-ajax": "^3.0.0",
"ember-auto-focus": "1.0.9",
"ember-auto-focus": "^2.0.1",
"ember-autoresize": "0.6.0",
"ember-can": "^0.8.4",
"ember-cli": "~2.14.0-beta.2",
Expand All @@ -41,13 +41,13 @@
"ember-cli-eslint": "^3.0.3",
"ember-cli-flash": "1.4.3",
"ember-cli-htmlbars": "^2.0.1",
"ember-cli-htmlbars-inline-precompile": "^0.4.3",
"ember-cli-htmlbars-inline-precompile": "^1.0.2",
"ember-cli-ic-ajax": "1.0.0",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-jwt-decode": "0.0.3",
"ember-cli-meta-tags": "3.1.0",
"ember-cli-mirage": "^0.3.4",
"ember-cli-moment-shim": "3.3.2",
"ember-cli-moment-shim": "^3.4.0",
"ember-cli-neat": "^0.0.6",
"ember-cli-page-object": "1.9.0",
"ember-cli-password-strength": "1.0.3",
Expand All @@ -59,24 +59,24 @@
"ember-cli-sri": "^2.1.0",
"ember-cli-test-loader": "^2.0.0",
"ember-cli-uglify": "^1.2.0",
"ember-click-outside": "0.1.9",
"ember-click-outside": "^0.1.10",
"ember-composable-helpers": "2.0.3",
"ember-concurrency": "^0.8.1",
"ember-data": "~2.13.0",
"ember-data": "^2.14.10",
"ember-deferred-content": "0.2.0",
"ember-disable-proxy-controllers": "^1.0.1",
"ember-dragula": "1.9.3",
"ember-exam": "0.7.0",
"ember-export-application-global": "^2.0.0",
"ember-i18n": "4.3.2",
"ember-i18n": "^5.0.2",
"ember-keyboard": "^2.1.9",
"ember-load-initializers": "^1.0.0",
"ember-metrics": "0.11.0",
"ember-metrics": "^0.12.1",
"ember-modal-dialog": "2.3.0",
"ember-moment": "7.3.1",
"ember-moment": "^7.4.1",
"ember-normalize": "1.0.0",
"ember-page-title": "tim-evans/ember-page-title",
"ember-power-select": "1.8.5",
"ember-page-title": "3.2.0",
"ember-power-select": "^1.9.5",
"ember-radio-button": "^1.0.7",
"ember-resolver": "^4.0.0",
"ember-route-action-helper": "^2.0.0",
Expand All @@ -93,7 +93,7 @@
"ember-typed": "0.1.3",
"ember-uploader": "1.2.3",
"ember-watson": "0.9.1",
"emberx-select": "3.0.1",
"emberx-select": "^3.1.0",
"eslint-plugin-ember-suave": "^1.0.0",
"loader.js": "^4.2.3",
"normalize.css": "^7.0.0",
Expand Down
37 changes: 23 additions & 14 deletions tests/helpers/mock-routing.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,28 @@ import Ember from 'ember';

const { Service } = Ember;

const service = Service.extend({
availableRoutes() {
return ['index'];
},
hasRoute(name) {
return name === 'index';
},
isActiveForRoute() {
return true;
},
generateURL(route) {
return `/${route}`;
},
_routerMicrolib: {}
});

export default function mockRouting({ container }) {
container.registry.register('service:-routing', Service.extend({
availableRoutes() {
return ['index'];
},
hasRoute(name) {
return name === 'index';
},
isActiveForRoute() {
return true;
},
generateURL(route) {
return `/${route}`;
}
}));
container.registry.register('service:-routing', service);
}

function mockRouter({ container }) {
container.registry.register('router:main', service);
}

export { mockRouting, mockRouter };
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import { moduleForComponent, test } from 'ember-qunit';
import hbs from 'htmlbars-inline-precompile';
import { mockRouter } from 'code-corps-ember/tests/helpers/mock-routing';

moduleForComponent('slugged-route-model-details', 'Integration | Component | slugged route model details', {
integration: true
integration: true,
beforeEach() {
mockRouter(this);
}
});

test('it renders', function(assert) {
Expand Down

0 comments on commit 28b35bd

Please sign in to comment.