Skip to content
This repository has been archived by the owner on Dec 10, 2024. It is now read-only.

get bower directory from the app instead of hardcoding to bower_components #14

Merged
merged 2 commits into from
Sep 7, 2014
Merged

get bower directory from the app instead of hardcoding to bower_components #14

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
81c6b47
change to use `app.bowerDirectory` instead of hardcoding to `bower_co…
tikotzky Sep 7, 2014
9156070
minor version bump
tikotzky Sep 7, 2014
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
14 changes: 7 additions & 7 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ module.exports = {

if (app.tests) {
var fileAssets = [
'bower_components/qunit/qunit/qunit.js',
'bower_components/qunit/qunit/qunit.css',
'bower_components/qunit-notifications/index.js',
app.bowerDirectory + '/qunit/qunit/qunit.js',
app.bowerDirectory + '/qunit/qunit/qunit.css',
app.bowerDirectory + '/qunit-notifications/index.js',
];

var imgAssets = [
'bower_components/ember-qunit-notifications/passed.png',
'bower_components/ember-qunit-notifications/failed.png',
app.bowerDirectory + '/ember-qunit-notifications/passed.png',
app.bowerDirectory + '/ember-qunit-notifications/failed.png',
];

app.import('bower_components/ember-qunit/dist/named-amd/main.js', {
app.import(app.bowerDirectory + '/ember-qunit/dist/named-amd/main.js', {
type: 'test',
exports: {
'ember-qunit': [
Expand All @@ -38,7 +38,7 @@ module.exports = {
}
});

app.import('bower_components/ember-cli-shims/test-shims.js', {
app.import(app.bowerDirectory + '/ember-cli-shims/test-shims.js', {
type: 'test',
exports: {
'qunit': ['default']
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-cli-qunit",
"version": "0.1.0",
"version": "0.1.1",
"description": "QUnit testing package for ember-cli applications",
"main": "index.js",
"scripts": {
Expand Down