Skip to content

Commit

Permalink
Bump some deps (#840)
Browse files Browse the repository at this point in the history
  • Loading branch information
RobbieTheWagner committed Jul 27, 2018
1 parent 56b6ee5 commit c6be063
Show file tree
Hide file tree
Showing 5 changed files with 1,017 additions and 1,274 deletions.
29 changes: 14 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,49 +30,48 @@
"0.0.0"
],
"devDependencies": {
"@html-next/vertical-collection": "^1.0.0-beta.10",
"amd-name-resolver": "^0.0.5",
"@html-next/vertical-collection": "^1.0.0-beta.12",
"amd-name-resolver": "^1.2.0",
"aws-sdk": "^2.3.3",
"babel-eslint": "^8.2.2",
"babel-eslint": "^8.2.6",
"babel-plugin-transform-es2015-modules-amd": "^6.24.0",
"basiccontext": "^3.5.1",
"broccoli-asset-rev": "^2.7.0",
"broccoli-babel-transpiler": "^6.0.0",
"broccoli-concat": "^3.0.1",
"broccoli-file-creator": "^1.1.1",
"broccoli-babel-transpiler": "^6.5.0",
"broccoli-concat": "^3.5.1",
"broccoli-file-creator": "^1.2.0",
"broccoli-funnel": "^2.0.1",
"broccoli-merge-trees": "^3.0.0",
"broccoli-stew": "^1.3.2",
"broccoli-stew": "^1.6.0",
"broccoli-string-replace": "^0.1.1",
"ember-async-image": "0.1.1",
"ember-cli": "~3.3.0",
"ember-cli-app-version": "^3.0.0",
"ember-cli-app-version": "^3.2.0",
"ember-cli-babel": "^6.6.0",
"ember-cli-dependency-checker": "^2.1.0",
"ember-cli-deprecation-workflow": "^0.2.2",
"ember-cli-eslint": "^4.2.3",
"ember-cli-htmlbars": "^2.0.3",
"ember-cli-htmlbars-inline-precompile": "^1.0.2",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-moment-shim": "^3.6.0",
"ember-cli-moment-shim": "^3.7.1",
"ember-cli-qunit": "^4.3.2",
"ember-cli-sass": "^7.1.7",
"ember-cli-shims": "^1.2.0",
"ember-cli-uglify": "^2.0.2",
"ember-concurrency": "0.8.15",
"ember-cli-uglify": "^2.1.0",
"ember-concurrency": "^0.8.19",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^1.1.0",
"ember-math-helpers": "^2.5.0",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-native-dom-helpers": "^0.4.2",
"ember-pikaday": "^2.2.2",
"ember-resolver": "^4.0.0",
"ember-route-action-helper": "^2.0.6",
"ember-source": "~3.3.0",
"ember-source-channel-url": "^1.0.1",
"ember-source-channel-url": "^1.1.0",
"ember-svg-jar": "^1.2.1",
"ember-truth-helpers": "2.0.0",
"ember-try": "^1.0.0-beta.1",
"ember-try": "^1.0.0-beta.3",
"eslint-plugin-ember": "^5.0.0",
"fstream": "^1.0.8",
"grunt": "^0.4.5",
Expand All @@ -85,7 +84,7 @@
"mkdirp": "^0.5.1",
"qunit-dom": "^0.6.2",
"rimraf": "^2.5.2",
"yauzl": "^2.4.1"
"yauzl": "^2.10.0"
},
"engines": {
"node": "6.* || 8.* || >= 10.*"
Expand Down
6 changes: 3 additions & 3 deletions tests/acceptance/data-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ module('Data Tab', function(hooks) {

rows = findAll('.js-record-list-item');
assert.equal(rows.length, 1);
assert.dom(findAll('.js-record-column', rows[0])[0]).hasText('2');
assert.dom(rows[0].querySelector('.js-record-column')).hasText('2');
});

test('Searching records', async function t(assert) {
Expand All @@ -197,13 +197,13 @@ module('Data Tab', function(hooks) {

rows = findAll('.js-record-list-item');
assert.equal(rows.length, 1);
assert.dom(findAll('.js-record-column', rows[0])[0]).hasText('2');
assert.dom(rows[0].querySelector('.js-record-column')).hasText('2');

await fillIn('.js-records-search input', 'my first post');

rows = findAll('.js-record-list-item');
assert.equal(rows.length, 1);
assert.dom(findAll('.js-record-column', rows[0])[0]).hasText('1');
assert.dom(rows[0].querySelector('.js-record-column')).hasText('1');

await fillIn('.js-records-search input', '');

Expand Down
16 changes: 11 additions & 5 deletions tests/acceptance/route-tree-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,29 +83,35 @@ module('Route Tree Tab', function(hooks) {
let routeNodes = findAll('.js-route-tree-item');
assert.equal(routeNodes.length, 4);

let routeNames = [...findAll('.js-route-name')].map(function(item) {
let routeNames = findAll('.js-route-name').map(function(item) {
return item.textContent.trim();
});
assert.deepEqual(routeNames, ['application', 'post', 'post.new', 'post.edit']);

let routeHandlers = [...findAll('.js-route-handler')].map(function(item) {
let routeHandlers = findAll('.js-route-handler').map(function(item) {
return item.textContent.trim();
});
assert.deepEqual(routeHandlers, ['ApplicationRoute', 'PostRoute', 'PostNewRoute', 'PostEditRoute']);

let controllers = [...findAll('.js-route-controller')].map(function(item) {
let controllers = findAll('.js-route-controller').map(function(item) {
return item.textContent.trim();
});

assert.deepEqual(controllers, ['ApplicationController', 'PostController', 'PostNewController', 'PostEditController']);

let templates = [...findAll('.js-route-template')].map(function(item) {
let templates = findAll('.js-route-template').map(function(item) {
return item.textContent.trim();
});

assert.deepEqual(templates, ['application', 'post', 'post/new', 'post/edit']);

let titleTips = [...findAll('span[title]', routeNodes)].map((n) => n.getAttribute('title')).sort();
let titleTips = [];

routeNodes.forEach((node) => {
titleTips = [...node.querySelectorAll('span[title]'), ...titleTips];
});

titleTips = titleTips.map((span) => span.getAttribute('title')).sort();

assert.deepEqual(titleTips, [
"ApplicationController",
Expand Down
5 changes: 0 additions & 5 deletions tests/ember_debug/object-inspector-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import EmberObject, { computed } from '@ember/object';
import Service from '@ember/service';
import Ember from 'ember';
import { module, test } from 'qunit';
import { settings as nativeDomHelpersSettings } from 'ember-native-dom-helpers';
import hbs from 'htmlbars-inline-precompile';
import require from 'require';
import wait from 'ember-test-helpers/wait';
Expand All @@ -26,7 +25,6 @@ function setupApp() {
}

let ignoreErrors = true;
let defaultRootForFinder;

module('Ember Debug - Object Inspector', function(hooks) {
// eslint-disable-next-line object-shorthand
Expand All @@ -52,12 +50,9 @@ module('Ember Debug - Object Inspector', function(hooks) {
await wait();
objectInspector = EmberDebug.get('objectInspector');
port = EmberDebug.port;
defaultRootForFinder = nativeDomHelpersSettings.rootElement;
nativeDomHelpersSettings.rootElement = 'body';
});

hooks.afterEach(async function() {
nativeDomHelpersSettings.rootElement = defaultRootForFinder;
name = null;
message = null;
await destroyEIApp.call(this, EmberDebug, App);
Expand Down
Loading

0 comments on commit c6be063

Please sign in to comment.