Skip to content

Commit

Permalink
Use ember-cli v0.2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
quaertym committed May 12, 2015
1 parent c3e678c commit 5251f24
Show file tree
Hide file tree
Showing 14 changed files with 193 additions and 69 deletions.
3 changes: 2 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ indent_style = space
indent_size = 2

[*.hbs]
insert_final_newline = false
indent_style = space
indent_size = 2

Expand All @@ -29,5 +30,5 @@ indent_size = 2
indent_style = space
indent_size = 2

[*.md]
[*.{diff,md}]
trim_trailing_whitespace = false
25 changes: 7 additions & 18 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -1,25 +1,15 @@
{
"predef": [
"console",
"it",
"describe",
"beforeEach",
"afterEach",
"before",
"after",
"document",
"window",
"-Promise"
],
"proto": true,
"strict": true,
"indent": 2,
"camelcase": true,
"node": true,
"browser": false,
"browser": true,
"boss": true,
"curly": true,
"latedef": "nofunc",
"debug": false,
"devel": false,
"devel": true,
"eqeqeq": true,
"evil": true,
"forin": false,
Expand All @@ -28,17 +18,16 @@
"newcap": true,
"noarg": true,
"noempty": false,
"quotmark": true,
"nonew": false,
"nomen": false,
"onevar": false,
"plusplus": false,
"regexp": false,
"undef": true,
"unused": true,
"sub": true,
"trailing": true,
"strict": false,
"white": false,
"eqnull": true,
"esnext": true
"esnext": true,
"unused": true
}
43 changes: 20 additions & 23 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# compiled output
/dist
/tmp
bower_components/
tests/
tmp/
dist/

# dependencies
/node_modules
node_modules/
!tests/fixtures/**/node_modules
/bower_components

# misc
/.sass-cache
Expand All @@ -17,22 +17,19 @@ testem.log
*.tgz

# other ember-cli dirs
/addon
/app
/config
/tests
/vendor

# other ember-cli files
/Brocfile.js
/testem.json
/bower.json

# other ember-cli dotfiles
/.bowerrc
/.editorconfig
/.ember-cli
/.jshintrc
/.travis.yml

addon/
app/
config/
tests/
vendor/

.jshintrc
.bowerrc
.editorconfig
.ember-cli
.travis.yml
.npmignore
**/.gitkeep
bower.json
Brocfile.js
testem.json
10 changes: 10 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,22 @@
---
language: node_js
node_js:
- "0.12"

sudo: false

cache:
directories:
- node_modules

matrix:
fast_finish: true

before_install:
- export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
- "npm config set spin false"
- "npm install -g npm@^2"

install:
- npm install -g bower
- npm install
Expand Down
1 change: 1 addition & 0 deletions Brocfile.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* jshint node: true */
/* global require, module */

var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014 Emre Unal
Copyright (c) 2015 Emre Unal

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
21 changes: 10 additions & 11 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
{
"name": "ember-cli-dependency-checker",
"dependencies": {
"handlebars": "~1.3.0",
"ember": "1.11.3",
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
"ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
"ember-data": "1.0.0-beta.16.1",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
"ember-qunit": "0.3.1",
"ember-qunit-notifications": "0.0.7",
"ember-resolver": "~0.1.15",
"jquery": "^1.11.1",
"ember": "1.7.0",
"ember-data": "1.0.0-beta.10",
"ember-resolver": "~0.1.7",
"loader.js": "stefanpenner/loader.js#1.0.1",
"ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3",
"ember-cli-test-loader": "rwjblue/ember-cli-test-loader#0.0.4",
"ember-load-initializers": "stefanpenner/ember-load-initializers#0.0.2",
"ember-qunit": "0.1.8",
"ember-qunit-notifications": "0.0.4",
"qunit": "~1.15.0"
"loader.js": "ember-cli/loader.js#3.2.0",
"qunit": "~1.17.1"
}
}
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,21 @@
"license": "MIT",
"readmeFile": "README.md",
"devDependencies": {
"body-parser": "^1.2.0",
"broccoli-asset-rev": "0.3.1",
"broccoli-ember-hbs-template-compiler": "^1.6.1",
"broccoli-asset-rev": "^2.0.2",
"chai": "^1.9.2",
"ember-cli": "git://github.com/stefanpenner/ember-cli#master",
"ember-cli-content-security-policy": "0.3.0",
"ember-cli": "0.2.3",
"ember-cli-app-version": "0.3.3",
"ember-cli-content-security-policy": "0.4.0",
"ember-cli-dependency-checker": "0.0.8",
"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.1.0",
"ember-data": "1.0.0-beta.10",
"ember-export-application-global": "^1.0.0",
"express": "^4.8.5",
"glob": "^4.0.5",
"ember-cli-qunit": "0.3.10",
"ember-cli-uglify": "1.0.1",
"ember-data": "1.0.0-beta.16.1",
"ember-export-application-global": "^1.0.2",
"ember-disable-prototype-extensions": "^1.0.0",
"glob": "^5.0.5",
"mocha": "^2.0.1",
"mocha-jshint": "0.0.9"
},
Expand All @@ -52,12 +54,10 @@
"dependency",
"check"
],
"ember-addon": {
"configPath": "tests/dummy/config"
},
"dependencies": {
"chalk": "^0.5.1",
"is-git-url": "^0.2.0",
"semver": "^4.1.0"
"semver": "^4.1.0",
"ember-cli-babel": "^5.0.0"
}
}
3 changes: 2 additions & 1 deletion testem.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"framework": "qunit",
"test_page": "tests/index.html",
"test_page": "tests/index.html?hidepassed",
"disable_watching": true,
"launch_in_ci": [
"PhantomJS"
],
Expand Down
57 changes: 57 additions & 0 deletions tests/.jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"predef": [
"document",
"window",
"location",
"setTimeout",
"$",
"-Promise",
"define",
"console",
"visit",
"exists",
"fillIn",
"click",
"keyEvent",
"triggerEvent",
"find",
"findWithAssert",
"wait",
"DS",
"andThen",
"currentURL",
"currentPath",
"currentRouteName",
"it",
"describe",
"beforeEach",
"afterEach",
"before",
"after"
],
"node": true,
"browser": false,
"boss": true,
"curly": false,
"debug": false,
"devel": false,
"eqeqeq": true,
"evil": true,
"forin": false,
"immed": false,
"laxbreak": false,
"newcap": true,
"noarg": true,
"noempty": false,
"nonew": false,
"nomen": false,
"onevar": false,
"plusplus": false,
"regexp": false,
"undef": true,
"sub": true,
"strict": false,
"white": false,
"eqnull": true,
"esnext": true
}
11 changes: 11 additions & 0 deletions tests/helpers/resolver.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import Resolver from 'ember/resolver';
import config from '../../config/environment';

var resolver = Resolver.create();

resolver.namespace = {
modulePrefix: config.modulePrefix,
podModulePrefix: config.podModulePrefix
};

export default resolver;
19 changes: 19 additions & 0 deletions tests/helpers/start-app.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import Ember from 'ember';
import Application from '../../app';
import Router from '../../router';
import config from '../../config/environment';

export default function startApp(attrs) {
var application;

var attributes = Ember.merge({}, config.APP);
attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;

Ember.run(function() {
application = Application.create(attributes);
application.setupForTesting();
application.injectTestHelpers();
});

return application;
}
33 changes: 33 additions & 0 deletions tests/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Dummy Tests</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">

{{content-for 'head'}}
{{content-for 'test-head'}}

<link rel="stylesheet" href="assets/vendor.css">
<link rel="stylesheet" href="assets/dummy.css">
<link rel="stylesheet" href="assets/test-support.css">

{{content-for 'head-footer'}}
{{content-for 'test-head-footer'}}
</head>
<body>

{{content-for 'body'}}
{{content-for 'test-body'}}
<script src="assets/vendor.js"></script>
<script src="assets/test-support.js"></script>
<script src="assets/dummy.js"></script>
<script src="testem.js"></script>
<script src="assets/test-loader.js"></script>

{{content-for 'body-footer'}}
{{content-for 'test-body-footer'}}
</body>
</html>
6 changes: 6 additions & 0 deletions tests/test-helper.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import resolver from './helpers/resolver';
import {
setResolver
} from 'ember-qunit';

setResolver(resolver);

0 comments on commit 5251f24

Please sign in to comment.