diff --git a/lib/redis.js b/lib/redis.js
index 16cf04e..adb806c 100644
--- a/lib/redis.js
+++ b/lib/redis.js
@@ -4,6 +4,7 @@ var Promise = require('ember-cli/lib/ext/promise');
module.exports = CoreObject.extend({
init: function(options, lib) {
+ this._super();
var redisOptions = {};
var redisLib = lib;
diff --git a/package.json b/package.json
index ab3b6dc..ec0d405 100644
--- a/package.json
+++ b/package.json
@@ -7,8 +7,6 @@
"test": "tests"
},
"scripts": {
- "start": "ember server",
- "build": "ember build",
"test": "node tests/runner.js"
},
"repository": "https://github.com/ember-cli-deploy/ember-cli-deploy-redis",
@@ -19,25 +17,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",
+ "chai": "^3.5.0",
+ "chai-as-promised": "^6.0.0",
+ "ember-cli": "2.9.1",
"ember-cli-release": "0.2.6",
- "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",
+ "github": "^6.1.0",
+ "glob": "^7.1.1",
+ "mocha": "^3.1.2",
"multiline": "^1.0.2"
},
"keywords": [
@@ -46,12 +32,11 @@
],
"dependencies": {
"chalk": "^1.0.0",
- "core-object": "^1.1.0",
- "ember-cli-babel": "^5.0.0",
+ "core-object": "^2.0.6",
"ember-cli-deploy-plugin": "^0.2.9",
- "redis": "^0.12.1",
+ "redis": "^2.6.3",
"rsvp": "^3.0.18",
- "then-redis": "^1.3.0"
+ "then-redis": "^2.0.1"
},
"ember-addon": {
"configPath": "tests/dummy/config"
diff --git a/tests/dummy/app/app.js b/tests/dummy/app/app.js
deleted file mode 100644
index 8d66b95..0000000
--- a/tests/dummy/app/app.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import Ember from 'ember';
-import Resolver from 'ember/resolver';
-import loadInitializers from 'ember/load-initializers';
-import config from './config/environment';
-
-var App;
-
-Ember.MODEL_FACTORY_INJECTIONS = true;
-
-App = Ember.Application.extend({
- modulePrefix: config.modulePrefix,
- podModulePrefix: config.podModulePrefix,
- Resolver: Resolver
-});
-
-loadInitializers(App, config.modulePrefix);
-
-export default App;
diff --git a/tests/dummy/app/components/.gitkeep b/tests/dummy/app/components/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/dummy/app/controllers/.gitkeep b/tests/dummy/app/controllers/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/dummy/app/helpers/.gitkeep b/tests/dummy/app/helpers/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html
deleted file mode 100644
index 1c49d36..0000000
--- a/tests/dummy/app/index.html
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
- Dummy
-
-
-
- {{content-for 'head'}}
-
-
-
-
- {{content-for 'head-footer'}}
-
-
- {{content-for 'body'}}
-
-
-
-
- {{content-for 'body-footer'}}
-
-
diff --git a/tests/dummy/app/models/.gitkeep b/tests/dummy/app/models/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js
deleted file mode 100644
index dce5994..0000000
--- a/tests/dummy/app/router.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import Ember from 'ember';
-import config from './config/environment';
-
-var Router = Ember.Router.extend({
- location: config.locationType
-});
-
-export default Router.map(function() {
-});
diff --git a/tests/dummy/app/routes/.gitkeep b/tests/dummy/app/routes/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/dummy/app/styles/app.css b/tests/dummy/app/styles/app.css
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs
deleted file mode 100644
index 05eb936..0000000
--- a/tests/dummy/app/templates/application.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-Welcome to Ember.js
-
-{{outlet}}
diff --git a/tests/dummy/app/templates/components/.gitkeep b/tests/dummy/app/templates/components/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/dummy/app/views/.gitkeep b/tests/dummy/app/views/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
deleted file mode 100644
index c59bcd5..0000000
--- a/tests/dummy/config/environment.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/* jshint node: true */
-
-module.exports = function(environment) {
- var ENV = {
- modulePrefix: 'dummy',
- environment: environment,
- baseURL: '/',
- locationType: 'auto',
- EmberENV: {
- FEATURES: {
- // Here you can enable experimental features on an ember canary build
- // e.g. 'with-controller': true
- }
- },
-
- APP: {
- // Here you can pass flags/options to your application instance
- // when it is created
- }
- };
-
- if (environment === 'development') {
- // ENV.APP.LOG_RESOLVER = true;
- // ENV.APP.LOG_ACTIVE_GENERATION = true;
- // ENV.APP.LOG_TRANSITIONS = true;
- // ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
- // ENV.APP.LOG_VIEW_LOOKUPS = true;
- }
-
- if (environment === 'test') {
- // Testem prefers this...
- ENV.baseURL = '/';
- ENV.locationType = 'none';
-
- // keep test console output quieter
- ENV.APP.LOG_ACTIVE_GENERATION = false;
- ENV.APP.LOG_VIEW_LOOKUPS = false;
-
- ENV.APP.rootElement = '#ember-testing';
- }
-
- if (environment === 'production') {
-
- }
-
- return ENV;
-};
diff --git a/tests/dummy/public/crossdomain.xml b/tests/dummy/public/crossdomain.xml
deleted file mode 100644
index 29a035d..0000000
--- a/tests/dummy/public/crossdomain.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/dummy/public/robots.txt b/tests/dummy/public/robots.txt
deleted file mode 100644
index 5debfa4..0000000
--- a/tests/dummy/public/robots.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# http://www.robotstxt.org
-User-agent: *
diff --git a/tests/helpers/assert.js b/tests/helpers/assert.js
new file mode 100644
index 0000000..ae4ba71
--- /dev/null
+++ b/tests/helpers/assert.js
@@ -0,0 +1,5 @@
+var chai = require('chai');
+var chaiAsPromised = require("chai-as-promised");
+chai.use(chaiAsPromised);
+
+module.exports = chai.assert;
diff --git a/tests/helpers/fake-redis-client.js b/tests/helpers/fake-redis-client.js
index 3213078..8a0e7c9 100644
--- a/tests/helpers/fake-redis-client.js
+++ b/tests/helpers/fake-redis-client.js
@@ -4,6 +4,7 @@ var CoreObject = require('core-object');
module.exports = CoreObject.extend({
init: function (options) {
+ this._super();
this.recentRevisions = [];
this.options = options;
},
diff --git a/tests/helpers/fake-redis-lib.js b/tests/helpers/fake-redis-lib.js
index e70885a..bb8210a 100644
--- a/tests/helpers/fake-redis-lib.js
+++ b/tests/helpers/fake-redis-lib.js
@@ -4,7 +4,8 @@ var CoreObject = require('core-object');
module.exports = CoreObject.extend({
init: function(clientClass) {
- this.clientClass = clientClass || FakeClient;
+ this._super();
+ this.clientClass = clientClass || FakeClient;
},
createClient: function(options) {
diff --git a/tests/helpers/resolver.js b/tests/helpers/resolver.js
deleted file mode 100644
index 28f4ece..0000000
--- a/tests/helpers/resolver.js
+++ /dev/null
@@ -1,11 +0,0 @@
-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;
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
deleted file mode 100644
index 16cc7c3..0000000
--- a/tests/helpers/start-app.js
+++ /dev/null
@@ -1,19 +0,0 @@
-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;
-}
diff --git a/tests/test-helper.js b/tests/test-helper.js
deleted file mode 100644
index e6cfb70..0000000
--- a/tests/test-helper.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import resolver from './helpers/resolver';
-import {
- setResolver
-} from 'ember-qunit';
-
-setResolver(resolver);
diff --git a/tests/unit/index-nodetest.js b/tests/unit/index-nodetest.js
index 0474d69..66df976 100644
--- a/tests/unit/index-nodetest.js
+++ b/tests/unit/index-nodetest.js
@@ -3,7 +3,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 FakeRedis = require('../helpers/fake-redis-lib');
var stubProject = {
diff --git a/tests/unit/lib/redis-nodetest.js b/tests/unit/lib/redis-nodetest.js
index 7786fa8..dbeb417 100644
--- a/tests/unit/lib/redis-nodetest.js
+++ b/tests/unit/lib/redis-nodetest.js
@@ -7,7 +7,7 @@ var FakeClient = require('../../helpers/fake-redis-client');
var Promise = require('ember-cli/lib/ext/promise');
-var assert = require('ember-cli/tests/helpers/assert');
+var assert = require('../../helpers/assert');
var CoreObject = require('core-object');
describe('redis', function() {
@@ -251,11 +251,11 @@ describe('redis', function() {
it('copies revision to the activeContentSuffix', function() {
var redisKey, redisValue;
- var redisClient = new FakeRedis(FakeClient.extend({
+ var redisClient = new FakeRedis(FakeClient.extend({
_db: {
"key-prefix:a": "first revision content",
"key-prefix:b": "second revision content",
- "key-prefix:c": "third revision content"
+ "key-prefix:c": "third revision content"
},
get: function(key) {