spassky 0.1.44 → 0.1.45

data/features/device_timeout.feature

@@ -20,6 +20,7 @@ Feature: Device Timeout
 
   Scenario: One device times out
     Given a connected mobile device "ipad"
+    And I have a timeout of 5 seconds
     When the device disconnects
     And I run "spassky run --pattern timed-out.html --test timed-out.html --server <host>" with the server host
     Then the output should contain:

data/features/step_definitions/steps.rb

@@ -34,6 +34,10 @@ end
 Given /^a Wireless Universal Resource FiLe$/ do
 end
 
+Given /^I have a timeout of (\d+) seconds?$/ do |timeout|
+  ENV["SPASSKY_TIMEOUT"] = timeout
+end
+
 When /^I run "([^"]*)" with the server host$/ do |command_line|
   run_simple(unescape(command_line.gsub('<host>', "http://#{@uri.host}:#{@uri.port}")), false)
 end

data/lib/spassky/server/app.rb

@@ -83,7 +83,7 @@ module Spassky::Server
     def get_test_file_contents
       file_name = params[:splat].join("/")
       assert_post_back_url = "/test_runs/#{params[:id]}/run/#{params[:random]}/assert"
-      TestSuiteContainer.new(test_run.contents, idle_url, assert_post_back_url, 60).get_file(file_name)
+      TestSuiteContainer.new(test_run.contents, idle_url, assert_post_back_url).get_file(file_name)
     end
 
     def save_test_result

data/lib/spassky/server/assert.js

@@ -3,5 +3,6 @@ function Spassky() {
     var img = document.createElement('img');
     img.setAttribute('src', '{ASSERT_POST_BACK_URL}?status=' + (status ? 'pass' : 'fail') + '&message=' + escape(message));
     document.body.appendChild(img);
+    window.location = "{IDLE_URL}";
   }
 }

data/lib/spassky/server/device_list.rb

@@ -21,7 +21,9 @@ module Spassky::Server
     private
 
     def recent? time
-      Time.now.to_f - time.to_f < 60
+      timeout = 60
+      timeout = Integer(ENV["SPASSKY_TIMEOUT"]) if ENV["SPASSKY_TIMEOUT"]
+      Time.now.to_f - time.to_f < timeout
     end
   end
 end

data/lib/spassky/server/test_suite_container.rb

@@ -1,10 +1,9 @@
 module Spassky::Server
   class TestSuiteContainer
-    def initialize(contents, next_url_to_redirect_to, assert_post_back_url, seconds)
+    def initialize(contents, next_url_to_redirect_to, assert_post_back_url)
       @contents = contents
       @next_url_to_redirect_to = next_url_to_redirect_to
       @assert_post_back_url = assert_post_back_url
-      @seconds = seconds
     end
 
     def get_file(name)
@@ -15,17 +14,14 @@ module Spassky::Server
     private
 
     def add_helpers_to_html html
-      html.gsub('</head>', assert_js_script + meta_refresh_tag + '</head>')
+      html.gsub('</head>', assert_js_script + '</head>')
     end
 
     def assert_js_script
       assert_js = File.read(File.join(File.dirname(__FILE__), 'assert.js'))
       assert_js.gsub!("{ASSERT_POST_BACK_URL}", @assert_post_back_url)
+      assert_js.gsub!("{IDLE_URL}", @next_url_to_redirect_to)
       "<script type=\"text/javascript\">#{assert_js}</script>"
     end
-
-    def meta_refresh_tag
-      "<meta http-equiv=\"refresh\" content=\"#{@seconds}; url='#{@next_url_to_redirect_to}'\">"
-    end
   end
 end

data/lib/spassky/version.rb

@@ -1,3 +1,3 @@
 module Spassky
-  VERSION = '0.1.44'
+  VERSION = '0.1.45'
 end

data/spec/spassky/server/app_spec.rb

@@ -106,7 +106,7 @@ module Spassky::Server
         TestRun.stub!(:find).with('123').and_return(test)
         html_test = mock(:html_test)
         html_test.stub!(:get_file).and_return("contents")
-        TestSuiteContainer.should_receive(:new).with({}, "/device/idle/random-string", "/test_runs/123/run/random/assert", 60).and_return html_test
+        TestSuiteContainer.should_receive(:new).with({}, "/device/idle/random-string", "/test_runs/123/run/random/assert").and_return html_test
         get "/test_runs/123/run/random/fake_test.html.file"
         last_response.body.should == "contents"
       end

data/spec/spassky/server/device_list_spec.rb

@@ -31,5 +31,16 @@ module Spassky::Server
       Time.stub!(:now).and_return(now)
       subject.recently_connected_devices.should == ["b"]
     end
+
+    it "supports timeouts set in the environment" do
+      now = Time.now
+      Time.stub!(:now).and_return(now - 30)
+      subject.update_last_connected("a")
+      Time.stub!(:now).and_return(now - 29)
+      subject.update_last_connected("b")
+      Time.stub!(:now).and_return(now)
+      ENV["SPASSKY_TIMEOUT"] = "30"
+      subject.recently_connected_devices.should == ["b"]
+    end
   end
 end

data/spec/spassky/server/test_suite_container_spec.rb

@@ -15,31 +15,30 @@ module Spassky::Server
 
     context "file name is a file" do
       it "returns the specified file" do
-        TestSuiteContainer.new(@test_contents, nil, "", nil).get_file("test_file.js").should == "some javascript"
+        TestSuiteContainer.new(@test_contents, "", "").get_file("test_file.js").should == "some javascript"
       end
     end
 
     context "with a file that is in a subdirectory" do
       it "returns the file" do
-        TestSuiteContainer.new(@test_contents, nil, "", nil).get_file("directory/another_directory/filename.txt").should == "file 1 contents"
+        TestSuiteContainer.new(@test_contents, "", "").get_file("directory/another_directory/filename.txt").should == "file 1 contents"
       end
     end
 
     describe "when the test contents includes a </head> tag" do
-      it "adds a meta-refresh tag to the test contents" do
-        url = "http://example.org"
-        seconds = 23
-        TestSuiteContainer.new(@test_contents, url, "", seconds).get_file("example_test.html").should include "<meta http-equiv=\"refresh\" content=\"#{seconds}; url='#{url}'\"></head>"
-      end
-
       it "adds the assert.js script to the head" do
         File.stub!(:read).and_return("assert.js!")
-        TestSuiteContainer.new(@test_contents, nil, "", nil).get_file("example_test.html").should include "<script type=\"text/javascript\">assert.js!</script>"
+        TestSuiteContainer.new(@test_contents, "", "").get_file("example_test.html").should include "<script type=\"text/javascript\">assert.js!</script>"
       end
 
       it "injects the assert post back url into assert.js" do
         File.stub!(:read).and_return("assert.js! {ASSERT_POST_BACK_URL}")
-        TestSuiteContainer.new(@test_contents, nil, "http://assert.org", nil).get_file("example_test.html").should include "assert.js! http://assert.org"
+        TestSuiteContainer.new(@test_contents, "", "http://assert.org").get_file("example_test.html").should include "assert.js! http://assert.org"
+      end
+
+      it "injects the idle url into assert.js" do
+        File.stub!(:read).and_return("assert.js! {IDLE_URL}")
+        TestSuiteContainer.new(@test_contents, "http://idle_url.org", "").get_file("example_test.html").should include "assert.js! http://idle_url.org"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spassky
 version: !ruby/object:Gem::Version
-  version: 0.1.44
+  version: 0.1.45
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-30 00:00:00.000000000Z
+date: 2011-10-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70092751572240 !ruby/object:Gem::Requirement
+  requirement: &70238235418160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70092751572240
+  version_requirements: *70238235418160
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70092751571700 !ruby/object:Gem::Requirement
+  requirement: &70238235417660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70092751571700
+  version_requirements: *70238235417660
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70092751571160 !ruby/object:Gem::Requirement
+  requirement: &70238235417180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70092751571160
+  version_requirements: *70238235417180
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &70092751570580 !ruby/object:Gem::Requirement
+  requirement: &70238235416640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70092751570580
+  version_requirements: *70238235416640
 - !ruby/object:Gem::Dependency
   name: wurfl-lite
-  requirement: &70092751570020 !ruby/object:Gem::Requirement
+  requirement: &70238235416100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70092751570020
+  version_requirements: *70238235416100
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70092751569380 !ruby/object:Gem::Requirement
+  requirement: &70238235415520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70092751569380
+  version_requirements: *70238235415520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70092751568760 !ruby/object:Gem::Requirement
+  requirement: &70238235414920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70092751568760
+  version_requirements: *70238235414920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70092751567920 !ruby/object:Gem::Requirement
+  requirement: &70238235414220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70092751567920
+  version_requirements: *70238235414220
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70092751566700 !ruby/object:Gem::Requirement
+  requirement: &70238235413100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70092751566700
+  version_requirements: *70238235413100
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70092751554700 !ruby/object:Gem::Requirement
+  requirement: &70238235412660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +122,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70092751554700
+  version_requirements: *70238235412660
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70092751554260 !ruby/object:Gem::Requirement
+  requirement: &70238235412100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +133,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70092751554260
+  version_requirements: *70238235412100
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70092751553660 !ruby/object:Gem::Requirement
+  requirement: &70238235407100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,10 +144,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70092751553660
+  version_requirements: *70238235407100
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70092751552940 !ruby/object:Gem::Requirement
+  requirement: &70238235406500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -155,7 +155,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70092751552940
+  version_requirements: *70238235406500
 description: ''
 email:
 - andrew.vos@gmail.com