Merge pull request locks#41 from WMeldon/ember-upgrades

Updated to ED beta 6 and Ember 1.5 beta 1

.gitignore

@@ -1 +1,2 @@
 tmp-update
+bower_components

.travis.yml

@@ -1,2 +1,5 @@
 language: node_js
+before_script:
+  - npm install -g bower
+  - bower install
 script: "phantomjs test/runner.js test/index.html"

README.md

@@ -3,7 +3,7 @@ Ember Data Local Storage Adapter
 
 Store your ember application data in localStorage.
 
-Compatible with Ember Data 1.0.beta.5.
+Compatible with Ember Data 1.0.beta.6.
 
 **NOTE**: New versions of the `localStorage` adapter are no longer compatible
 with older versions of Ember Data. For older versions, checkout the `pre-beta`
@@ -69,6 +69,14 @@ Todo
 Tests
 -----
 
+If you don't have bower, install it with
+
+    npm install bower -g
+
+Then install the dependencies with
+
+    ```bower install```
+
 Open `tests/index.html` in a browser. If you have `phantomjs` installed,
 run
 

bower.json

@@ -19,7 +19,7 @@
     "vendor"
   ],
   "dependencies": {
-    "ember-data": ">= 1.0.0-beta.5",
+    "ember-data": ">= 1.0.0-beta.6",
     "ember": ">= 1.0.0"
   }
 }

test/helpers.js

@@ -59,14 +59,14 @@ var setupStore = function(options) {
     adapter: adapter
   }));
 
-  container.register('serializer:_default', DS.LSSerializer);
-  container.register('serializer:_rest', DS.RESTSerializer);
-  container.register('adapter:_rest', DS.RESTAdapter);
+  container.register('serializer:-default', DS.LSSerializer);
+  container.register('serializer:-rest', DS.RESTSerializer);
+  container.register('adapter:-rest', DS.RESTAdapter);
 
   container.injection('serializer', 'store', 'store:main');
 
-  env.serializer = container.lookup('serializer:_default');
-  env.restSerializer = container.lookup('serializer:_rest');
+  env.serializer = container.lookup('serializer:-default');
+  env.restSerializer = container.lookup('serializer:-rest');
   env.store = container.lookup('store:main');
   env.adapter = env.store.get('defaultAdapter');
 

test/index.html

@@ -10,10 +10,10 @@
   <div id="qunit"></div>
 
   <!-- adapter deps -->
-  <script src="../vendor/jquery.js"></script>
-  <script src="../vendor/handlebars.js"></script>
-  <script src="../vendor/ember.js"></script>
-  <script src="../vendor/ember-data.js"></script>
+  <script src="../bower_components/jquery/jquery.js"></script>
+  <script src="../bower_components/handlebars/handlebars.js"></script>
+  <script src="../bower_components/ember/ember.js"></script>
+  <script src="../bower_components/ember-data/ember-data.js"></script>
 
   <!-- src -->
   <script src="../localstorage_adapter.js"></script>

test/tests.js

@@ -269,17 +269,17 @@ test('changes in bulk', function() {
 
     createdList.then(function(lists) {
       equal(get(lists, 'length'), 1, "Record was created successfully");
-      promises.push(Ember.RSVP.Promise());
+      promises.push(new Ember.RSVP.Promise(function(){}));
     });
 
     store.find('list', 'l2').then(function(list) {
       equal(get(list, 'length'), undefined, "Record was deleted successfully");
-      promises.push(Ember.RSVP.Promise());
+      promises.push(new Ember.RSVP.Promise(function(){}));
     });
 
     updatedList.then(function(list) {
       equal(get(list, 'name'), 'updated', "Record was updated successfully");
-      promises.push(Ember.RSVP.Promise());
+      promises.push(new Ember.RSVP.Promise(function(){}));
     });
 
     Ember.RSVP.all(promises).then(function() {
@@ -317,7 +317,7 @@ test('load belongsTo association', function() {
   stop();
 
   store.find('item', 'i1').then(function(item) {
-    return Ember.RSVP.Promise(function(resolve) { resolve(get(item, 'list')); });
+    return new Ember.RSVP.Promise(function(resolve) { resolve(get(item, 'list')); });
   }).then(function(list) {
     equal(get(list, 'id'), 'l1', "id is loaded correctly");
     equal(get(list, 'name'), 'one', "name is loaded correctly");