Skip to content

Commit

Permalink
Updated deps
Browse files Browse the repository at this point in the history
  • Loading branch information
kimroen committed Feb 20, 2015
1 parent 6e424e4 commit c1fd95e
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
13 changes: 6 additions & 7 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
{
"name": "ember-cli-autoprefixer",
"dependencies": {
"handlebars": "~1.3.0",
"jquery": "^1.11.1",
"ember": "1.8.1",
"ember-data": "1.0.0-beta.12",
"ember": "1.10.0",
"ember-data": "1.0.0-beta.15",
"ember-resolver": "~0.1.11",
"loader.js": "ember-cli/loader.js#1.0.1",
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
"ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.0",
"ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.3",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
"ember-qunit": "0.1.8",
"ember-qunit-notifications": "0.0.5",
"ember-qunit": "0.2.8",
"ember-qunit-notifications": "0.0.7",
"qunit": "~1.17.1"
}
}
}
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.0.0",
"broccoli-ember-hbs-template-compiler": "^1.6.1",
"ember-cli": "0.1.12",
"ember-cli-6to5": "^3.0.0",
"ember-cli": "0.2.0-beta.1",
"ember-cli-app-version": "0.3.1",
"ember-cli-babel": "^4.0.0",
"ember-cli-content-security-policy": "0.3.0",
"ember-cli-dependency-checker": "0.0.7",
"ember-cli-htmlbars": "0.7.4",
"ember-cli-ic-ajax": "0.1.1",
"ember-cli-inject-live-reload": "^1.3.0",
"ember-cli-qunit": "0.3.1",
"ember-cli-app-version": "0.3.1",
"ember-cli-qunit": "0.3.8",
"ember-cli-uglify": "1.0.1",
"ember-data": "1.0.0-beta.12",
"ember-export-application-global": "^1.0.0",
"ember-data": "1.0.0-beta.15",
"ember-export-application-global": "^1.0.2",
"express": "^4.8.5",
"glob": "^4.0.5"
},
Expand Down
15 changes: 8 additions & 7 deletions tests/acceptance/application-test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Ember from 'ember';
import { module, test } from 'qunit';
import startApp from '../helpers/start-app';

var application;
Expand All @@ -9,28 +10,28 @@ function getCssProperty(element, property) {
}

module('Acceptance: Application (Chrome Only)', {
setup: function() {
beforeEach: function() {
application = startApp();
},
teardown: function() {
afterEach: function() {
Ember.run(application, 'destroy');
}
});

/**
Execute this test in Chrome or PhantomJS for correct results
*/
test('Verify correct webkit vendor prefix from autoprefixer', function() {
test('Verify correct webkit vendor prefix from autoprefixer', function(assert) {
var webkitUserSelect;

expect(3);
assert.expect(3);

visit('/');
andThen(function() {
webkitUserSelect = getCssProperty('title', '-webkit-user-select');

equal(currentPath(), 'index', "On the index page");
equal(find('#title').length, 1, "Page contains a header title");
equal(webkitUserSelect, 'none', "");
assert.equal(currentPath(), 'index', "On the index page");
assert.equal(find('#title').length, 1, "Page contains a header title");
assert.equal(webkitUserSelect, 'none', "");
});
});

0 comments on commit c1fd95e

Please sign in to comment.