Skip to content

Commit a83ee6a

Browse files
author
Duke
committed
update libraries
1 parent 0696d8f commit a83ee6a

13 files changed

+80
-52
lines changed

‎.watchmanconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"ignore_dirs": ["tmp"]
2+
"ignore_dirs": ["tmp", "dist"]
33
}

‎app/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<meta name="MobileOptimized" content="320">
88
<meta name="HandheldFriendly" content="True">
99
<meta name="apple-mobile-web-app-capable" content="yes">
10-
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
1110

1211
<title>Uhura - The best podcast player</title>
1312
<meta name="description" content="">
13+
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
1414

1515
<meta property="og:title" content="Uhura App" />
1616
<meta property="og:image" content="" />

‎app/router.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Ember from 'ember';
22
import config from './config/environment';
33

4-
let Router = Ember.Router.extend({
4+
const Router = Ember.Router.extend({
55
location: config.locationType
66
});
77

‎bower.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
"version": "0.2.2",
44
"dependencies": {
55
"ember": "2.0.0",
6-
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.4",
7-
"ember-cli-test-loader": "ember-cli-test-loader#0.2.0",
6+
"ember-cli-shims": "0.0.6",
7+
"ember-cli-test-loader": "0.2.1",
88
"ember-data": "2.0.0",
9-
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.6",
10-
"ember-qunit": "0.4.13",
11-
"ember-qunit-notifications": "0.0.7",
12-
"ember-resolver": "0.1.20",
13-
"jquery": "1.11.3",
14-
"loader.js": "ember-cli/loader.js#3.3.0",
15-
"qunit": "1.18.0",
9+
"ember-load-initializers": "0.1.7",
10+
"ember-qunit": "0.4.16",
11+
"ember-qunit-notifications": "0.1.0",
12+
"ember-resolver": "~0.1.20",
13+
"jquery": "^1.11.3",
14+
"loader.js": "ember-cli/loader.js#3.4.0",
15+
"qunit": "~1.20.0",
1616
"mediaelement": "2.17.0",
1717
"ember-simple-auth": "0.7.2",
1818
"moment": "2.9.0",

‎ember-cli-build.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/*jshint node:true*/
12
/* global require, module */
23
var EmberApp = require('ember-cli/lib/broccoli/ember-app');
34

‎package.json

+19-19
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,34 @@
1818
"author": "",
1919
"license": "MIT",
2020
"devDependencies": {
21-
"broccoli-asset-rev": "2.1.3",
22-
"ember-cli": "1.13.8",
21+
"broccoli-asset-rev": "2.4.1",
22+
"ember-cli": "1.13.13",
2323
"ember-cli-app-version": "1.0.0",
24-
"ember-cli-babel": "5.1.5",
24+
"ember-cli-babel": "5.1.6",
2525
"ember-cli-content-security-policy": "0.4.0",
26-
"ember-cli-dependency-checker": "1.0.1",
27-
"ember-cli-deprecation-workflow": "0.1.4",
28-
"ember-cli-htmlbars": "1.0.0",
29-
"ember-cli-htmlbars-inline-precompile": "0.2.0",
30-
"ember-cli-ic-ajax": "0.2.1",
31-
"ember-cli-inject-live-reload": "1.3.1",
32-
"ember-cli-mirage": "0.1.8",
33-
"ember-cli-qunit": "1.0.1",
26+
"ember-cli-dependency-checker": "1.2.0",
27+
"ember-cli-deprecation-workflow": "0.1.5",
28+
"ember-cli-htmlbars": "1.0.1",
29+
"ember-cli-htmlbars-inline-precompile": "0.3.1",
30+
"ember-cli-ic-ajax": "0.2.4",
31+
"ember-cli-inject-live-reload": "1.4.0",
32+
"ember-cli-mirage": "0.1.11",
33+
"ember-cli-qunit": "1.1.0",
3434
"ember-cli-release": "0.2.6",
3535
"ember-cli-rollbar": "davewasmer/ember-cli-rollbar#master",
36-
"ember-cli-sass": "5.0.0",
37-
"ember-cli-sri": "1.0.3",
36+
"ember-cli-sass": "5.2.1",
37+
"ember-cli-sri": "2.0.0",
3838
"ember-cli-uglify": "1.2.0",
3939
"ember-data": "2.0.0",
4040
"ember-disable-proxy-controllers": "1.0.1",
41-
"ember-export-application-global": "1.0.4",
41+
"ember-export-application-global": "1.0.5",
4242
"ember-infinite-scroll": "0.2.4",
43-
"ember-notify": "4.2.0",
44-
"ember-page-title": "2.0.6",
45-
"ember-simple-auth": "simplabs/ember-simple-auth#master",
43+
"ember-notify": "4.3.1",
44+
"ember-page-title": "2.0.7",
45+
"ember-simple-auth": "1.0.1",
4646
"ember-suave": "1.2.3",
47-
"ember-truth-helpers": "1.1.0",
48-
"liquid-fire": "0.21.2"
47+
"ember-truth-helpers": "1.2.0",
48+
"liquid-fire": "0.22.1"
4949
},
5050
"main": "dist/index.html",
5151
"window": {

‎testem.json

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
{
22
"framework": "qunit",
3-
"test_page": "tests/index.html?coverage",
3+
"test_page": "tests/index.html?hidepassed",
44
"disable_watching": true,
55
"launch_in_ci": [
66
"PhantomJS"
77
],
88
"launch_in_dev": [
99
"PhantomJS",
10-
"Chrome",
11-
"Firefox",
12-
"Safari"
10+
"Chrome"
1311
]
1412
}

‎tests/helpers/destroy-app.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import Ember from 'ember';
2+
3+
export default function destroyApp(application) {
4+
Ember.run(application, 'destroy');
5+
}

‎tests/helpers/module-for-acceptance.js

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import { module } from 'qunit';
2+
import startApp from '../helpers/start-app';
3+
import destroyApp from '../helpers/destroy-app';
4+
5+
export default function(name, options = {}) {
6+
module(name, {
7+
beforeEach() {
8+
this.application = startApp();
9+
10+
if (options.beforeEach) {
11+
options.beforeEach.apply(this, arguments);
12+
}
13+
},
14+
15+
afterEach() {
16+
destroyApp(this.application);
17+
18+
if (options.afterEach) {
19+
options.afterEach.apply(this, arguments);
20+
}
21+
}
22+
});
23+
}

‎tests/helpers/resolver.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Resolver from 'ember/resolver';
22
import config from '../../config/environment';
33

4-
let resolver = Resolver.create();
4+
const resolver = Resolver.create();
55

66
resolver.namespace = {
77
modulePrefix: config.modulePrefix,

‎tests/helpers/start-app.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export default function startApp(attrs) {
88
let attributes = Ember.merge({}, config.APP);
99
attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
1010

11-
Ember.run(function() {
11+
Ember.run(() => {
1212
application = Application.create(attributes);
1313
application.setupForTesting();
1414
application.injectTestHelpers();

‎tests/index.html

+16-14
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<meta charset='utf-8'>
5-
<meta http-equiv='X-UA-Compatible' content='IE=edge'>
4+
<meta charset="utf-8">
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<title>Uhuraapp Tests</title>
7-
<meta name='description' content=''>
8-
<meta name='viewport' content='width=device-width, initial-scale=1'>
7+
<meta name="description" content="">
8+
<meta name="viewport" content="width=device-width, initial-scale=1">
99

1010
{{content-for 'head'}}
1111
{{content-for 'test-head'}}
1212

13-
<link rel='stylesheet' href='assets/vendor.css'>
14-
<link rel='stylesheet' href='assets/uhuraapp.css'>
15-
<link rel='stylesheet' href='assets/test-support.css'>
13+
<link rel="stylesheet" href="assets/vendor.css">
14+
<link rel="stylesheet" href="assets/uhuraapp.css">
15+
<link rel="stylesheet" href="assets/test-support.css">
1616
<style>#blanket-main { position: relative; z-index: 99999; }</style>
1717
<script type="text/javascript" charset="utf-8">
1818
window.UserVoice = []
@@ -25,13 +25,15 @@
2525

2626
{{content-for 'body'}}
2727
{{content-for 'test-body'}}
28-
<script src='assets/vendor.js'></script>
29-
<script src='assets/test-support.js'></script>
30-
<script src='assets/uhuraapp.js'></script>
31-
<script src='assets/blanket-options.js'></script>
32-
<script src='assets/blanket-loader.js'></script>
33-
<script src='testem.js'></script>
34-
<script src='assets/test-loader.js'></script>
28+
29+
<script src="assets/vendor.js"></script>
30+
<script src="assets/test-support.js"></script>
31+
<script src="assets/uhuraapp.js"></script>
32+
<script src="assets/blanket-options.js"></script>
33+
<script src="assets/blanket-loader.js"></script>
34+
<script src="testem.js" integrity=""></script>
35+
<script src="assets/tests.js"></script>
36+
<script src="assets/test-loader.js"></script>
3537

3638
{{content-for 'body-footer'}}
3739
{{content-for 'test-body-footer'}}

‎tests/test-helper.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import resolver from './helpers/resolver';
2-
32
import {
43
setResolver
54
} from 'ember-qunit';

0 commit comments

Comments
 (0)