fix tests/index.html

emberjs · Mar 29, 2015 · cf14655 · cf14655
1 parent f070ed8
commit cf14655
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/packages/ember-data/lib/main.js b/packages/ember-data/lib/main.js
@@ -8,7 +8,11 @@
 Ember.RSVP.Promise.cast = Ember.RSVP.Promise.cast || Ember.RSVP.resolve;
 
 Ember.runInDebug(function() {
-  if (Ember.VERSION.match(/1\.[0-7]\./)) {
+  var [major, minor] = Ember.VERSION.split(".");
+  major = Number(major);
+  minor = Number(minor);
+
+  if (major < 1 || minor < 8) {
     throw new Ember.Error("Ember Data requires at least Ember 1.8.0, but you have " +
                           Ember.VERSION +
                           ". Please upgrade your version of Ember, then upgrade Ember Data");

diff --git a/packages/ember-data/lib/serializers/rest-serializer.js b/packages/ember-data/lib/serializers/rest-serializer.js
@@ -2,8 +2,8 @@
   @module ember-data
 */
 
-import JSONSerializer from "ember-data/serializers/json_serializer";
-import { singularize } from "ember-inflector/lib/system/string";
+import JSONSerializer from "ember-data/serializers/json-serializer";
+import { singularize } from "ember-inflector";
 
 var forEach = Ember.ArrayPolyfills.forEach;
 var map = Ember.ArrayPolyfills.map;

diff --git a/packages/ember-data/lib/system/relationship-meta.js b/packages/ember-data/lib/system/relationship-meta.js
@@ -1,4 +1,4 @@
-import { singularize } from "ember-inflector/lib/system";
+import { singularize } from "ember-inflector";
 
 export function typeForRelationshipMeta(store, meta) {
   var typeKey, type;

diff --git a/packages/ember-data/lib/system/store.js b/packages/ember-data/lib/system/store.js
@@ -9,7 +9,7 @@ import {
   InvalidError,
   Adapter
 } from "ember-data/system/adapter";
-import { singularize } from "ember-inflector/lib/system/string";
+import { singularize } from "ember-inflector";
 import {
   Map
 } from "ember-data/system/map";

diff --git a/tests/index.html b/tests/index.html
@@ -4,10 +4,10 @@
     <meta charset="utf-8">
     <title>Ember Data</title>
 
-    <link rel="stylesheet" href="/bower_components/qunit/qunit/qunit.css">
-    <script src="../bower_components/qunit/qunit/qunit.js"></script>
+    <link rel="stylesheet" href="../qunit/qunit.css">
+    <script src="../qunit/qunit.js"></script>
     <script src="qunit-configuration.js"></script>
-    <script src="../bower_components/handlebars/handlebars.js" ></script>
+    <script src="../handlebars/handlebars.js" ></script>
 
     <script type="text/javascript">
       window.loadScript = function(url) {