eris 0.0.7 → 0.0.8

data/lib/eris/js/jasmineEnyoBootstrap.js

@@ -19,9 +19,14 @@ jasmineEnyoBootstrap.getXhr = function() {
 jasmineEnyoBootstrap.setLaunchParams = function() {
 
   var xhr = jasmineEnyoBootstrap.getXhr();
-  var erisConfig = JSON.parse(xhr.open("GET", "eris_config.json", true).responseText);
+  xhr.open("GET", "eris_config.json", false);
+  xhr.send();
 
-  var launchParams = erisConfig.enyoLaunchParams;
+  if (xhr.status != 200) {
+    return;
+  }
+
+  var launchParams = JSON.parse(xhr.responseText).enyoLaunchParams;
 
   if (!launchParams) {
     return;
@@ -35,3 +40,5 @@ jasmineEnyoBootstrap.setLaunchParams = function() {
     }).join('&');
   }
 };
+
+jasmineEnyoBootstrap.setLaunchParams();

data/lib/eris/lib/jasmine_config_overrides.rb

@@ -27,8 +27,8 @@ module Jasmine
       map('/__JASMINE_ROOT__') { run Rack::File.new(Jasmine.root) }
       map(config.spec_path)    { run Rack::File.new(config.spec_dir) }
       map(config.root_path)    { run Rack::File.new(config.project_root) }
-      eris_config = ErisConfig.new(:config_path => 'eris_config.json', :app_root => config.project_root)
 
+      eris_config = ErisConfig.new(:config_path => 'eris_config.json', :app_root => config.project_root)
       map("/usr/palm/frameworks") { run Rack::File.new(eris_config.enyo_root) }
 
       map("/__ERIS_RESOURCES__") { run Rack::File.new(File.expand_path(File.join(File.dirname(__FILE__), '/../js'))) }

data/lib/eris/version.rb

@@ -1,3 +1,3 @@
 module Eris
-  Eris::VERSION = "0.0.7"
+  Eris::VERSION = "0.0.8"
 end

data/spec/javascripts/SetLaunchParamsSpec.js

@@ -1,19 +1,21 @@
 describe("setLaunchParams", function () {
-
+  var fakeXhr, fakeResponse;
   beforeEach(function() {
     window.history.pushState({}, "Jasmine Suite", "http://localhost:8888/");
+    fakeXhr = {
+      open: function() {},
+      send: function() {
+        fakeXhr.status = fakeResponse.status;
+       fakeXhr.responseText = fakeResponse.responseText;
+      },
+      responseText: null
+    };
+    spyOn(jasmineEnyoBootstrap, 'getXhr').andReturn(fakeXhr);
   });
 
   describe("when no launch parameters are specified", function () {
     beforeEach(function() {
-      spyOn(jasmineEnyoBootstrap, 'getXhr').andCallFake(function() {
-        return {
-          open: function() {
-            return testResponses.erisConfig.noLaunchParams.success;
-          }
-        }
-      });
-
+      fakeResponse = testResponses.erisConfig.noLaunchParams.success;
       jasmineEnyoBootstrap.setLaunchParams();
     });
 
@@ -24,14 +26,7 @@ describe("setLaunchParams", function () {
 
   describe("when launch parameters are specified", function () {
     beforeEach(function() {
-      spyOn(jasmineEnyoBootstrap, 'getXhr').andCallFake(function() {
-        return {
-          open: function() {
-            return testResponses.erisConfig.withLaunchParams.success;
-          }
-        }
-      });
-
+      fakeResponse = testResponses.erisConfig.withLaunchParams.success;
       jasmineEnyoBootstrap.setLaunchParams();
     });
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eris
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - HP webOS
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-05 00:00:00 -07:00
+date: 2011-08-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency