Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 12 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,13 @@
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.0.2",
"chai": "^2.2.0",
"chai-as-promised": "^5.0.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.3.10",
"ember-cli-release": "0.2.3",
"ember-cli-uglify": "1.0.1",
"ember-data": "1.0.0-beta.16.1",
"ember-disable-prototype-extensions": "^1.0.0",
"ember-export-application-global": "^1.0.2",
"ember-try": "0.0.4",
"github": "^0.2.4",
"glob": "^5.0.5",
"mocha": "^2.2.4",
"chai": "^3.5.0",
"chai-as-promised": "^5.3.0",
"ember-cli": "2.9.1",
"ember-cli-release": "1.0.0-beta.2",
"github": "^2.5.1",
"glob": "^7.0.5",
"mocha": "^3.0.2",
"multiline": "^1.0.2",
"rimraf": "^2.3.4"
},
Expand All @@ -46,12 +34,11 @@
"ember-cli-deploy-plugin"
],
"dependencies": {
"chalk": "^1.0.0",
"core-object": "^1.1.0",
"ember-cli-deploy-plugin": "^0.2.2",
"ember-cli-babel": "^5.0.0",
"minimatch": "^3.0.2",
"rsvp": "^3.0.18"
"chalk": "^1.1.3",
"core-object": "^2.0.6",
"ember-cli-deploy-plugin": "^0.2.6",
"minimatch": "^3.0.3",
"rsvp": "^3.2.1"
},
"ember-addon": {
"configPath": "tests/dummy/config"
Expand Down
18 changes: 0 additions & 18 deletions tests/dummy/app/app.js

This file was deleted.

Empty file.
Empty file.
Empty file removed tests/dummy/app/helpers/.gitkeep
Empty file.
25 changes: 0 additions & 25 deletions tests/dummy/app/index.html

This file was deleted.

Empty file removed tests/dummy/app/models/.gitkeep
Empty file.
9 changes: 0 additions & 9 deletions tests/dummy/app/router.js

This file was deleted.

Empty file removed tests/dummy/app/routes/.gitkeep
Empty file.
Empty file removed tests/dummy/app/styles/app.css
Empty file.
3 changes: 0 additions & 3 deletions tests/dummy/app/templates/application.hbs

This file was deleted.

Empty file.
Empty file removed tests/dummy/app/views/.gitkeep
Empty file.
47 changes: 0 additions & 47 deletions tests/dummy/config/environment.js

This file was deleted.

15 changes: 0 additions & 15 deletions tests/dummy/public/crossdomain.xml

This file was deleted.

2 changes: 0 additions & 2 deletions tests/dummy/public/robots.txt

This file was deleted.

5 changes: 5 additions & 0 deletions tests/helpers/assert.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
var chai = require('chai');
var chaiAsPromised = require("chai-as-promised");
chai.use(chaiAsPromised);

module.exports = chai.assert;
11 changes: 0 additions & 11 deletions tests/helpers/resolver.js

This file was deleted.

19 changes: 0 additions & 19 deletions tests/helpers/start-app.js

This file was deleted.

6 changes: 0 additions & 6 deletions tests/test-helper.js

This file was deleted.

12 changes: 6 additions & 6 deletions tests/unit/index-nodetest.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

var Promise = require('ember-cli/lib/ext/promise');
var assert = require('ember-cli/tests/helpers/assert');
var assert = require('../helpers/assert');
var fs = require('fs');
var path = require('path');
var rimraf = Promise.denodeify(require('rimraf'));
Expand Down Expand Up @@ -150,8 +150,8 @@ describe('gzip plugin', function() {
return rimraf(context.distDir);
});

it('gzips the matching files which are not ignored', function(done) {
return assert.isFulfilled(plugin.willUpload(context))
it('gzips the matching files which are not ignored', function() {
assert.isFulfilled(plugin.willUpload(context))
.then(function(result) {
assert.deepEqual(result, { gzippedFiles: ['assets/foo.js'] });
done();
Expand All @@ -166,7 +166,7 @@ describe('gzip plugin', function() {
});

it('gzips the matching files with .gz suffix', function(done) {
return assert.isFulfilled(plugin.willUpload(context))
assert.isFulfilled(plugin.willUpload(context))
.then(function(result) {
assert.deepEqual(result.gzippedFiles, ['assets/foo.js.gz']);
done();
Expand All @@ -176,7 +176,7 @@ describe('gzip plugin', function() {
});

it('adds the gzipped files to the distFiles', function(done) {
return assert.isFulfilled(plugin.willUpload(context))
assert.isFulfilled(plugin.willUpload(context))
.then(function(result) {
assert.include(result.distFiles, 'assets/foo.js.gz');
done();
Expand All @@ -186,7 +186,7 @@ describe('gzip plugin', function() {
});

it('does not use the same object for gzippedFiles and distFiles', function(done) {
return assert.isFulfilled(plugin.willUpload(context))
assert.isFulfilled(plugin.willUpload(context))
.then(function(result) {
assert.notStrictEqual(result.distFiles, result.gzippedFiles);
done();
Expand Down