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.

Sign up for GitHub

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

Upgrade to ember-cli 1.13.7 #32

Merged
merged 2 commits into from
Aug 7, 2015
Merged

Upgrade to ember-cli 1.13.7 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b84592f
Rewrite focus test to pass consistently
chrislopresto Aug 7, 2015
7c34b13
Upgrade to ember-cli 1.13.7
chrislopresto Aug 7, 2015
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
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ env:
- EMBER_TRY_SCENARIO=ember-canary

matrix:
fast_finish: true
allow_failures:
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary
Expand Down
6 changes: 3 additions & 3 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "ember-wormhole",
"dependencies": {
"ember": "1.13.5",
"ember": "1.13.6",
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
"ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
"ember-qunit": "0.4.1",
"ember-qunit": "0.4.9",
"ember-qunit-notifications": "0.0.7",
"ember-resolver": "~0.1.18",
"jquery": "^1.11.1",
"loader.js": "ember-cli/loader.js#3.2.0",
"qunit": "~1.17.1"
"qunit": "~1.18.0"
}
}
7 changes: 4 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.0.2",
"ember-cli": "1.13.1",
"ember-cli": "1.13.7",
"ember-cli-app-version": "0.4.0",
"ember-cli-content-security-policy": "0.4.0",
"ember-cli-dependency-checker": "^1.0.0",
Expand All @@ -28,13 +28,14 @@
"ember-cli-htmlbars-inline-precompile": "^0.1.1",
"ember-cli-ic-ajax": "0.2.1",
"ember-cli-inject-live-reload": "^1.3.0",
"ember-cli-qunit": "0.3.15",
"ember-cli-qunit": "0.3.20",
"ember-cli-release": "^0.2.5",
"ember-cli-sri": "^1.0.1",
"ember-cli-uglify": "^1.0.1",
"ember-code-snippet": "1.1.0",
"ember-disable-prototype-extensions": "^1.0.0",
"ember-disable-proxy-controllers": "^1.0.0",
"ember-export-application-global": "^1.0.2",
"ember-export-application-global": "^1.0.3",
"ember-try": "0.0.6"
},
"keywords": [
Expand Down
12 changes: 11 additions & 1 deletion tests/acceptance/wormhole-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import {
} from 'qunit';
import startApp from 'dummy/tests/helpers/start-app';

const { set } = Ember;

var application;
var assert = QUnit.assert;

Expand Down Expand Up @@ -193,18 +195,26 @@ test('throws if destination element id falsy', function(assert) {
});

test('preserves focus', function (assert) {
var sidebarWormhole;
var focused;
visit('/');
andThen(function() {
assert.equal(currentPath(), 'index');
});
click('button:contains(Toggle Sidebar Content)');
andThen(function() {
sidebarWormhole = Ember.$('#sidebarWormhole').data('ember-wormhole');
assert.contentIn('sidebar');
assert.contentNotIn('othersidebar');
Ember.$('button:contains(Hide Sidebar Content)').focus();
focused = document.activeElement;
});
click('button:contains(Switch Sidebars From Without)');
andThen(function() {
set(sidebarWormhole, 'to', 'othersidebar');
});
andThen(function() {
assert.contentNotIn('sidebar');
assert.contentIn('othersidebar');
assert.equal(document.activeElement, focused);
});
});
Expand Down