Get Things Working

emberjs · Jan 28, 2015 · 5500641 · 5500641
1 parent 6b4977c
commit 5500641
Show file tree

Hide file tree

Showing 15 changed files with 556 additions and 506 deletions.
diff --git a/bower.json b/bower.json
@@ -3,7 +3,7 @@
   "private": true,
   "dependencies": {
     "ember": "~1.9.0",
-    "jquery": "~1.11.0",
+    "jquery": "~1.10.x",
     "qunit": "~1.12.0",
     "qunit-phantom-runner": "jonkemp/qunit-phantomjs-runner#1.2.0"
   },

diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
     "chalk": "~0.4.0",
     "defeatureify": "~0.1.4",
     "ejs": "^1.0.0",
-    "ember-cli": "0.0.46",
+    "ember-cli": "~0.1.11",
     "ember-publisher": "0.0.6",
     "emberjs-build": "file:../emberjs-build",
     "git-repo-version": "0.0.2",

diff --git a/packages/activemodel-adapter/tests/integration/active_model_adapter_test.js b/packages/activemodel-adapter/tests/integration/active_model_adapter_test.js
@@ -1,5 +1,3 @@
-import { setupStore } from "ember-data/tests/helpers/integration";
-
 var env, store, adapter, SuperUser;
 var passedUrl, passedVerb, passedHash;
 module("integration/active_model_adapter - AMS Adapter", {

diff --git a/packages/activemodel-adapter/tests/integration/active_model_serializer_test.js b/packages/activemodel-adapter/tests/integration/active_model_serializer_test.js
@@ -1,5 +1,3 @@
-import { setupStore } from "ember-data/tests/helpers/integration";
-
 var get = Ember.get;
 var HomePlanet, league, SuperVillain, EvilMinion, YellowMinion, DoomsdayDevice, MediocreVillain, env;
 var run = Ember.run;

diff --git a/packages/activemodel-adapter/tests/unit/adapter/path_for_type_test.js b/packages/activemodel-adapter/tests/unit/adapter/path_for_type_test.js
@@ -1,5 +1,3 @@
-import { setupStore } from "ember-data/tests/helpers/integration";
-
 var env, adapter;
 module("unit/adapter/path_for_type - DS.ActiveModelAdapter#pathForType", {
   setup: function() {

diff --git a/packages/ember-data/tests/helpers/assertions.js b/packages/ember-data/tests/helpers/assertions.js
diff --git a/packages/ember-data/tests/helpers/integration.js b/packages/ember-data/tests/helpers/integration.js
diff --git a/packages/ember-data/tests/integration/adapter/find_all_test.js b/packages/ember-data/tests/integration/adapter/find_all_test.js
@@ -1,5 +1,3 @@
-import { createStore } from "ember-data/tests/helpers/integration";
-
 var get = Ember.get;
 var Person, store, allRecords;
 var run = Ember.run;

diff --git a/packages/ember-data/tests/integration/adapter/find_test.js b/packages/ember-data/tests/integration/adapter/find_test.js
@@ -1,5 +1,3 @@
-import { createStore } from "ember-data/tests/helpers/integration";
-
 var Person, store;
 var run = Ember.run;
 

diff --git a/packages/ember-data/tests/unit/adapters/rest_adapter/path_for_type_test.js b/packages/ember-data/tests/unit/adapters/rest_adapter/path_for_type_test.js
@@ -1,5 +1,3 @@
-import { setupStore } from "ember-data/tests/helpers/integration";
-
 var env, adapter;
 module("unit/adapters/rest_adapter/path_for_type - DS.RESTAdapter#pathForType", {
   setup: function() {

diff --git a/server/index.js b/server/index.js
diff --git a/tests/ember-data-setup.js b/tests/ember-data-setup.js
diff --git a/tests/ember_configuration.js b/tests/ember_configuration.js