jasmine 0.10.3 → 0.10.3.1

data/lib/jasmine/config.rb

@@ -17,7 +17,7 @@ module Jasmine
 
     def start
       start_servers
-      @client = Jasmine::SeleniumDriver.new("localhost", @selenium_server_port, "*#{@browser}", "http://localhost:#{@jasmine_server_port}/")
+      @client = Jasmine::SeleniumDriver.new("localhost", @selenium_server_port, "*#{@browser}", "#{jasmine_host}:#{@jasmine_server_port}/")
       @client.connect
     end
 
@@ -26,6 +26,10 @@ module Jasmine
       stop_servers
     end
 
+    def jasmine_host
+      ENV["JASMINE_HOST"] || 'http://localhost'
+    end
+
     def start_jasmine_server
       @jasmine_server_port = Jasmine::find_unused_port
       server = Jasmine::Server.new(@jasmine_server_port, self)

data/spec/config_spec.rb

@@ -46,9 +46,9 @@ describe Jasmine::Config do
           @config.spec_files.should == ['ExampleSpec.js']
           @config.helpers.should == ['helpers/SpecHelper.js']
           @config.js_files.should == [
-                   '/__spec__/helpers/SpecHelper.js',
-                   '/__spec__/ExampleSpec.js',
-                 ]
+            '/__spec__/helpers/SpecHelper.js',
+            '/__spec__/ExampleSpec.js',
+          ]
           @config.js_files("ExampleSpec.js").should ==
             ['/__spec__/helpers/SpecHelper.js',
              '/__spec__/ExampleSpec.js']
@@ -141,9 +141,9 @@ describe Jasmine::Config do
 
   end
 
-  describe "browsers" do
+  describe "browser configuration" do
     it "should use firefox by default" do
-      ENV.should_receive(:[], "JASMINE_BROWSER").and_return(nil)
+      ENV.stub!(:[], "JASMINE_BROWSER").and_return(nil)
       config = Jasmine::Config.new
       config.stub!(:start_servers)
       Jasmine::SeleniumDriver.should_receive(:new).
@@ -153,7 +153,7 @@ describe Jasmine::Config do
     end
 
     it "should use ENV['JASMINE_BROWSER'] if set" do
-      ENV.should_receive(:[], "JASMINE_BROWSER").and_return("mosaic")
+      ENV.stub!(:[], "JASMINE_BROWSER").and_return("mosaic")
       config = Jasmine::Config.new
       config.stub!(:start_servers)
       Jasmine::SeleniumDriver.should_receive(:new).
@@ -161,6 +161,31 @@ describe Jasmine::Config do
         and_return(mock(Jasmine::SeleniumDriver, :connect => true))
       config.start
     end
+    end
+
+  describe "jasmine host" do
+    it "should use http://localhost by default" do
+      config = Jasmine::Config.new
+      config.instance_variable_set(:@jasmine_server_port, '1234')
+      config.stub!(:start_servers)
+
+      Jasmine::SeleniumDriver.should_receive(:new).
+        with(anything(), anything(), anything(), "http://localhost:1234/").
+        and_return(mock(Jasmine::SeleniumDriver, :connect => true))
+      config.start
+    end
+
+    it "should use ENV['JASMINE_HOST'] if set" do
+      ENV.stub!(:[], "JASMINE_HOST").and_return("http://some_host")
+      config = Jasmine::Config.new
+      config.instance_variable_set(:@jasmine_server_port, '1234')
+      config.stub!(:start_servers)
+
+      Jasmine::SeleniumDriver.should_receive(:new).
+        with(anything(), anything(), anything(), "http://some_host:1234/").
+        and_return(mock(Jasmine::SeleniumDriver, :connect => true))
+      config.start
+    end
   end
 
   describe "#start_selenium_server" do
@@ -172,4 +197,5 @@ describe Jasmine::Config do
     end
   end
 
+
 end

metadata

@@ -6,7 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 10
   - 3
-  version: 0.10.3
+  - 1
+  version: 0.10.3.1
 platform: ruby
 authors: 
 - Rajan Agaskar
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 00:00:00 -07:00
+date: 2010-04-02 00:00:00 -07:00
 default_executable: jasmine
 dependencies: 
 - !ruby/object:Gem::Dependency