Skip to content

Instantly share code, notes, and snippets.

@buritica
Created August 25, 2014 04:50
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save buritica/f7135548e28b8e9d998c to your computer and use it in GitHub Desktop.
Save buritica/f7135548e28b8e9d998c to your computer and use it in GitHub Desktop.
Breaking tests after ember-cli update
On branch ember-cli-update
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
deleted: .bowerrc
modified: .gitignore
modified: .travis.yml
modified: Brocfile.js
modified: bower.json
modified: package.json
modified: readme.md
modified: tests/test-helper.js
Untracked files:
(use "git add <file>..." to include in what will be committed)
.editorconfig
diff --git a/.bowerrc b/.bowerrc
deleted file mode 100644
index 6866ac2..0000000
--- a/.bowerrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "directory": "vendor"
-}
diff --git a/.gitignore b/.gitignore
index f4d4f1f..7da12c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@
# dependencies
/node_modules
-/vendor/*
+/bower_components/*
# misc
/.sass-cache
diff --git a/.travis.yml b/.travis.yml
index 6d4f3c6..df6253d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,16 @@
+---
language: node_js
-node_js:
- - 0.10
-before_script:
- - npm install -g grunt-cli
+
+sudo: false
+
+cache:
+ directories:
+ - node_modules
+
+install:
- npm install -g bower
+ - npm install
- bower install
+
+script:
+ - npm test
diff --git a/Brocfile.js b/Brocfile.js
index 6658f93..c315972 100644
--- a/Brocfile.js
+++ b/Brocfile.js
@@ -3,7 +3,7 @@
var EmberApp = require('ember-cli/lib/broccoli/ember-app');
var pickFiles = require('broccoli-static-compiler');
var mergeTrees = require('broccoli-merge-trees');
-
+var vendor = 'bower_components/';
var app = new EmberApp();
// Use `app.import` to add additional libraries to the generated
@@ -22,32 +22,32 @@ var app = new EmberApp();
/**
* JS Dependencies
*/
-app.import('vendor/lodash/dist/lodash.js');
-app.import('vendor/jquery/dist/jquery.js');
-app.import('vendor/swipe/swipe.js');
+app.import(vendor + 'lodash/dist/lodash.js');
+app.import(vendor + 'jquery/dist/jquery.js');
+app.import(vendor + 'swipe/swipe.js');
/**
* CSS Dependencies
*/
- app.import('vendor/foundation/css/normalize.css');
- app.import('vendor/foundation/css/foundation.css');
+ app.import(vendor + 'foundation/css/normalize.css');
+ app.import(vendor + 'foundation/css/foundation.css');
/**
* Test & Dev only
*/
-var qunitBdd = pickFiles('vendor/qunit-bdd/lib', {
+var qunitBdd = pickFiles(vendor + 'qunit-bdd/lib', {
srcDir: '/',
files: ['qunit-bdd.js'],
destDir: '/assets'
});
-var sinon = pickFiles('vendor/sinonjs', {
+var sinon = pickFiles(vendor + '/sinonjs', {
srcDir: '/',
files: ['sinon.js'],
destDir: '/assets'
});
-var foundationSourceMap = pickFiles('vendor/foundation', {
+var foundationSourceMap = pickFiles(vendor + 'foundation', {
srcDir: '/css',
files: [
'foundation.css.map',
diff --git a/bower.json b/bower.json
index a488e1a..7dbe026 100644
--- a/bower.json
+++ b/bower.json
@@ -5,13 +5,13 @@
"jquery": "~1.11.1",
"qunit": "~1.15.0",
"ember-qunit": "~0.1.8",
- "ember": "1.6.1",
- "ember-resolver": "~0.1.5",
- "loader": "stefanpenner/loader.js#1.0.0",
- "ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.2",
+ "ember": "1.7.0",
+ "ember-resolver": "~0.1.7",
+ "loader": "stefanpenner/loader.js#1.0.1",
+ "ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3",
"ember-load-initializers": "stefanpenner/ember-load-initializers#0.0.2",
"ember-qunit-notifications": "^0.0.3",
- "ember-cli-test-loader": "rjackson/ember-cli-test-loader#0.0.2",
+ "ember-cli-test-loader": "rjackson/ember-cli-test-loader#0.0.4",
"ember-easyForm": "http://builds.dockyard.com/ember-easyForm/latest/ember-easyForm.js",
"lodash": "~2.4.1",
"swipe": "~2.0.0",
diff --git a/package.json b/package.json
index 58303c2..1aa7ecb 100644
--- a/package.json
+++ b/package.json
@@ -20,17 +20,19 @@
"devDependencies": {
"body-parser": "^1.2.0",
"broccoli-asset-rev": "0.0.17",
- "broccoli-ember-hbs-template-compiler": "^1.5.0",
+ "broccoli-ember-hbs-template-compiler": "^1.6.1",
"broccoli-merge-trees": "~0.1.4",
"broccoli-static-compiler": "~0.1.4",
- "broccoli-stylus-single": "git://github.com/buritica/broccoli-stylus-single",
"ember-cli": "0.0.41",
"ember-cli-ember-data": "0.1.0",
"ember-cli-ic-ajax": "0.1.1",
+ "ember-cli-inject-live-reload": "^1.0.2",
+ "ember-cli-qunit": "0.0.5",
"express": "^4.1.1",
"glob": "^3.2.9",
"i": "~0.3.2",
"originate": "0.1.5",
- "stylus": "~0.47.3"
+ "stylus": "~0.47.3",
+ "broccoli-stylus-single": "git://github.com/buritica/broccoli-stylus-single"
}
}
diff --git a/readme.md b/readme.md
index 70496ed..96d8684 100644
--- a/readme.md
+++ b/readme.md
@@ -22,4 +22,4 @@ This README outlines the details of collaborating on this Ember application.
* `ember build`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment