spassky 0.1.37 → 0.1.38

data/README.md

@@ -29,15 +29,10 @@ Architecture
        +-------+   +-------+   +-----+
 ```
 
-
-
 Developers push JS unit tests to the Spassky server through a command line interface.
 Multiple devices connected to the central Spassky server will poll the server for a suite of tests.
 The browser will be redirected to the test page, run the tests, and then are redirected to the idle loop.
 
-
-
-
 Installation
 ------------
 
@@ -45,8 +40,6 @@ Installation
 gem install spassky
 ```
 
-
-
 ![Spassky](https://github.com/BBC/spassky/raw/master/spassky.jpg)
 
 
@@ -56,7 +49,7 @@ Usage
 Start the server:
 
 ```
-spassky server 9191
+spassky server --port 9191
 ```
 
 Connect test devices by browsing to http://localhost:9191/device/connect on the device. The device will stay in an idle meta refresh loop until it receives a test to run.
@@ -64,25 +57,25 @@ Connect test devices by browsing to http://localhost:9191/device/connect on the
 Check what devices are connected to the server:
 
 ```
-spassky devices http://localhost:9191
+spassky devices --server http://localhost:9191
 ```
 
 Run a single html file (the second parameter is the test name):
 
 ```
-spassky run html_test.html html_test.html http://localhost:9191
+spassky run --pattern html_test.html --test html_test.html --server http://localhost:9191
 ```
 
 Run a test with colour:
 
 ```
-spassky run html_test.html html_test.html http://localhost:9191 --colour
+spassky run --pattern html_test.html --test html_test.html --server http://localhost:9191 --colour
 ```
 
 Run a directory that contains a test
 
 ```
-spassky run test_directory html_test.html http://localhost:9191
+spassky run --pattern test_directory --test html_test.html --server http://localhost:9191
 ```
 
 Why?
@@ -97,7 +90,7 @@ Test structure
 --------------
 Tests can be either a single html file, or a directory containing multiple files.
 
-If spassky is given a directory, it will pass all files in that directory to that server. The first html file will be used as the test entry point. Any other files in the test directory can be linked to from the html file relatively.
+If spassky is given a directory, it will pass all files in that directory to that server. Any other files in the test directory can be linked to from the html file relatively.
 
 ### An example test directory:
 ```

data/bin/spassky

@@ -4,5 +4,34 @@ $:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(_
 require 'rubygems'
 require 'spassky'
 require 'spassky/client/cli'
+require 'trollop'
 
-Commandable.execute(ARGV)
+command = ARGV.shift
+
+if command == "run"
+  options = Trollop::options do
+    opt :pattern, "Test file name or test directory", :type => String
+    opt :test,    "Test file name",                   :type => String
+    opt :server,  "Spassky server",                   :type => String,  :default => Spassky::Client::Cli::DEFAULT_SERVER
+    opt :colour,  "Output tests results in colour",   :default => false
+  end
+  Spassky::Client::Cli.new.run(options[:pattern], options[:test], options[:server], options[:colour])
+elsif command == "devices"
+  options = Trollop::options do
+    opt :server, "Spassky server", :type => String, :default => Spassky::Client::Cli::DEFAULT_SERVER
+  end
+  Spassky::Client::Cli.new.devices(options[:server])
+elsif command == "server"
+  options = Trollop::options do
+    opt :port, "The port to run the server on", :type => String, :default => Spassky::Client::Cli::DEFAULT_PORT
+  end
+  Spassky::Client::Cli.new.server(options[:port])
+else
+  puts <<-USAGE
+  Spassky (version #{Spassky::VERSION})
+  Usage:
+  spassky run --pattern <pattern> --test <test> [--server <server>] [--colour]
+  spassky devices [--server <server>]
+  spassky server [--port <port>]
+  USAGE
+end

data/examples/qunit-failing/main.js

@@ -1,8 +1,9 @@
 QUnit.done = function(result) {
+  var spassky = new Spassky();
   if (result.failed > 0) {
-    assert(false, "qunit failed");
+    spassky.assert(false, "qunit failed");
   } else {
-    assert(true, "qunit passed");
+    spassky.assert(true, "qunit passed");
   }
 };
 

data/examples/qunit-passing/main.js

@@ -1,8 +1,9 @@
 QUnit.done = function(result) {
+  var spassky = new Spassky();
   if (result.failed > 0) {
-    assert(false, "qunit failed");
+    spassky.assert(false, "qunit failed");
   } else {
-    assert(true, "qunit passed");
+    spassky.assert(true, "qunit passed");
   }
 };
 

data/features/device_timeout.feature

@@ -21,7 +21,7 @@ Feature: Device Timeout
   Scenario: One device times out
     Given a connected mobile device "ipad"
     When the device disconnects
-    And I run "spassky run timed-out.html timed-out.html <host>" with the server host
+    And I run "spassky run --pattern timed-out.html --test timed-out.html --server <host>" with the server host
     Then the output should contain:
       """
       TIMED OUT timed-out.html on ipad

data/features/list_devices.feature

@@ -7,11 +7,10 @@ Feature: List Connected Devices
     Given a Wireless Universal Resource FiLe
     And a connected mobile device "Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1A543a Safari/419.3"
     And a connected mobile device "Mozilla/5.0(iPad; U; CPU iPhone OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B314 Safari/531.21.10"
-    When I run "spassky devices <host>" with the server host
+    When I run "spassky devices --server <host>" with the server host
     Then the output should contain exactly:
     """
     iPhone (id = apple_iphone_ver1_suba543, mobile_browser = Safari, device_os_version = 1.0)
     iPad (id = apple_ipad_ver1_sub5312110, mobile_browser = Safari, device_os_version = 3.2)
 
-
     """

data/features/run_html_tests.feature

@@ -13,7 +13,7 @@ Feature: Run HTML Tests
           <body>
           <h1>A PASSING test!</h1>
           <script type="text/javascript">
-          assert(true, 'this test should pass');
+          new Spassky().assert(true, 'this test should pass');
           </script>
           </body>
         </html>
@@ -26,7 +26,7 @@ Feature: Run HTML Tests
           <body>
           <h1>A FAILING test!</h1>
           <script type="text/javascript">
-          assert(false, 'this test should fail');
+          new Spassky().assert(false, 'this test should fail');
           </script>
           </body>
         </html>
@@ -34,7 +34,7 @@ Feature: Run HTML Tests
 
   Scenario: No connected devices
     Given I have no connected devices
-    When I run "spassky run passing.html passing.html <host>" with the server host
+    When I run "spassky run --pattern passing.html --test passing.html --server <host>" with the server host
     Then the output should contain:
       """
       There are no connected devices
@@ -43,7 +43,7 @@ Feature: Run HTML Tests
 
   Scenario: One device with a user agent that exists in WURFL
     Given a connected mobile device "Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1A543a Safari/419.3"
-    When I run "spassky run passing.html passing.html <host>" with the server host
+    When I run "spassky run --pattern passing.html --test passing.html --server <host>" with the server host
     Then the output should contain:
       """
       PASS passing.html on iPhone (id = apple_iphone_ver1_suba543, mobile_browser = Safari, device_os_version = 1.0)
@@ -52,7 +52,7 @@ Feature: Run HTML Tests
 
   Scenario: One passing test on one device
     Given a connected mobile device "blackberry"
-    When I run "spassky run passing.html passing.html <host>" with the server host
+    When I run "spassky run --pattern passing.html --test passing.html --server <host>" with the server host
     Then the output should contain:
       """
       PASS passing.html on blackberry
@@ -62,7 +62,7 @@ Feature: Run HTML Tests
   Scenario: One passing test on two devices
     Given a connected mobile device "blackberry"
     And a connected mobile device "iphone"
-    When I run "spassky run passing.html passing.html <host>" with the server host
+    When I run "spassky run --pattern passing.html --test passing.html --server <host>" with the server host
     Then the output should contain:
       """
       PASS passing.html on blackberry
@@ -75,7 +75,7 @@ Feature: Run HTML Tests
 
   Scenario: Failing test
     Given a connected mobile device "blackberry"
-    When I run "spassky run failing.html failing.html <host>" with the server host
+    When I run "spassky run --pattern failing.html --test failing.html --server <host>" with the server host
     Then the output should contain:
       """
       FAIL failing.html on blackberry
@@ -84,7 +84,7 @@ Feature: Run HTML Tests
 
   Scenario: Failing Test with Message
     Given a connected mobile device "blackberry"
-    When I run "spassky run failing.html failing.html <host>" with the server host
+    When I run "spassky run --pattern failing.html --test failing.html --server <host>" with the server host
     Then the output should contain:
       """
       FAIL failing.html on blackberry

data/features/run_qunit_tests.feature

@@ -8,10 +8,11 @@ Feature: Run QUnit Tests
     Given a file named "qunit_passing/qunit_test/passing.js" with:
       """
       QUnit.done = function(result) {
+        var spassky = new Spassky();
         if (result.failed > 0) {
-          assert(false, "qunit failed");
+          spassky.assert(false, "qunit failed");
         } else {
-          assert(true, "qunit passed");
+          spassky.assert(true, "qunit passed");
         }
       };
 
@@ -32,7 +33,7 @@ Feature: Run QUnit Tests
       </html>
       """
     And a connected mobile device "blackberry"
-    When I run "spassky run qunit_passing/qunit_test test_suite.html <host>" with the server host
+    When I run "spassky run --pattern qunit_passing/qunit_test --test test_suite.html --server <host>" with the server host
     Then the output should contain:
       """
       PASS test_suite.html on blackberry
@@ -43,10 +44,11 @@ Feature: Run QUnit Tests
     Given a file named "qunit_failing/qunit_test/failing.js" with:
       """
       QUnit.done = function(result) {
+        var spassky = new Spassky();
         if (result.failed > 0) {
-          assert(false, "qunit failed");
+          spassky.assert(false, "qunit failed");
         } else {
-          assert(true, "qunit passed");
+          spassky.assert(true, "qunit passed");
         }
       };
 
@@ -67,7 +69,7 @@ Feature: Run QUnit Tests
       </html>
       """
     And a connected mobile device "blackberry"
-    When I run "spassky run qunit_failing/qunit_test test_suite.html <host>" with the server host
+    When I run "spassky run --pattern qunit_failing/qunit_test --test test_suite.html --server <host>" with the server host
     Then the output should contain:
       """
       FAIL test_suite.html on blackberry
@@ -78,10 +80,11 @@ Feature: Run QUnit Tests
     Given a file named "qunit_passing/qunit_test/another_directory/passing.js" with:
       """
       QUnit.done = function(result) {
+        var spassky = new Spassky();
         if (result.failed > 0) {
-          assert(false, "qunit failed");
+          spassky.assert(false, "qunit failed");
         } else {
-          assert(true, "qunit passed");
+          spassky.assert(true, "qunit passed");
         }
       };
 
@@ -102,9 +105,31 @@ Feature: Run QUnit Tests
       </html>
       """
     And a connected mobile device "blackberry"
-    When I run "spassky run qunit_passing/qunit_test test_suite.html <host>" with the server host
+    When I run "spassky run --pattern qunit_passing/qunit_test --test test_suite.html --server <host>" with the server host
     Then the output should contain:
       """
       PASS test_suite.html on blackberry
       """
     And the exit status should be 0
+
+  Scenario: Test with a file in a relative path
+    Given a file named "test/js/passing.js" with:
+      """
+      new Spassky().assert(true, "qunit passed");
+      """
+    And a file named "test/html/suite.html" with:
+      """
+      <html>
+        <head></head>
+        <body>
+          <script type="text/javascript" src="../js/passing.js"></script>
+        </body>
+      </html>
+      """
+    And a connected mobile device "blackberry"
+    When I run "spassky run --pattern test --test html/suite.html --server <host>" with the server host
+    Then the output should contain:
+      """
+      PASS html/suite.html on blackberry
+      """
+    And the exit status should be 0

data/features/server.feature

@@ -4,5 +4,5 @@ Feature: Server
   I want to be able to type 'spassky server 9393' to launch a server
 
   Scenario: Launch Server
-    Given I run the command "spassky server 9393"
+    Given I run the command "spassky server --port 9393"
     Then it should not crash

data/features/step_definitions/steps.rb

@@ -61,8 +61,8 @@ When /^the device disconnects$/ do
   end
 end
 
-Given /^I run the command "spassky server 9393"$/ do
-  @spassky_server_process = ChildProcess.build('./bin/spassky server 9393')
+Given /^I run the command "spassky server --port 9393"$/ do
+  @spassky_server_process = ChildProcess.build('./bin/spassky server --port 9393')
   @spassky_server_process.start
 end
 

data/features/summary.feature

@@ -10,7 +10,7 @@ Feature: Summary
           <head></head>
           <body>
           <script type="text/javascript">
-          assert(true, 'this test should pass');
+          new Spassky().assert(true, 'this test should pass');
           </script>
           </body>
         </html>
@@ -21,7 +21,7 @@ Feature: Summary
           <head></head>
           <body>
           <script type="text/javascript">
-          assert(false, 'this test should fail');
+          new Spassky().assert(false, 'this test should fail');
           </script>
           </body>
         </html>
@@ -29,5 +29,5 @@ Feature: Summary
 
   Scenario: One test passing on all devices
     Given I have two connected devices
-    When I run "spassky run passing.html passing.html <host>" with the server host
+    When I run "spassky run --pattern passing.html --test passing.html --server <host>" with the server host
     Then the output should contain "2 passed"

data/features/support/env.rb

@@ -1,7 +1,6 @@
 require 'capybara'
 require 'capybara/dsl'
 require 'capybara/cucumber'
-
 require 'aruba/cucumber'
 
 $:.unshift(File.join(File.dirname(__FILE__), '../../lib'))
@@ -28,4 +27,4 @@ def register_driver_with_user_agent user_agent
   Capybara.current_driver = user_agent.to_sym
 end
 
-ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
+ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"

data/lib/spassky/client/cli.rb

@@ -5,24 +5,19 @@ require 'spassky/client/device_list_retriever'
 require 'spassky/client/test_suite_runner'
 require 'spassky/client/pusher'
 require 'spassky/client/directory_reader'
-require 'commandable'
 
 module Spassky::Client
   class Cli
-    extend Commandable
-
     DEFAULT_PORT = "9191"
     DEFAULT_SERVER = "http://localhost:#{DEFAULT_PORT}"
 
-    command "run a test"
-    def run(pattern, test, server = DEFAULT_SERVER, colour = false)
+    def run(pattern, test, server = DEFAULT_SERVER, colour = FALSE)
       writer = colour ? ColouredWriter : DefaultWriter
       pusher = Pusher.new(server)
       test_suite_runner = TestSuiteRunner.new(pusher, writer.new(STDOUT), DirectoryReader.new(pattern))
       test_suite_runner.run_test_suite(pattern, test)
     end
 
-    command "list devices"
     def devices(server = DEFAULT_SERVER)
       Spassky::Client::DeviceListRetriever.new(server).get_connected_devices.each do |device|
         puts device
@@ -30,7 +25,6 @@ module Spassky::Client
       nil
     end
 
-    command "run the spassky server"
     def server(port = DEFAULT_PORT)
       Spassky::Server::App.set :port, port
       Spassky::Server::App.run!

data/lib/spassky/client/device_list_retriever.rb

@@ -2,7 +2,6 @@ require 'restclient'
 
 module Spassky::Client
   class DeviceListRetriever
-
     def initialize(url)
       @url = url
     end
@@ -10,6 +9,5 @@ module Spassky::Client
     def get_connected_devices
       JSON.parse(RestClient.get(@url + "/devices/list"))
     end
-
   end
 end

data/lib/spassky/server/app.rb

@@ -2,7 +2,7 @@ require 'sinatra/base'
 require 'spassky/server/random_string_generator'
 require 'spassky/server/test_run'
 require 'spassky/server/device_list'
-require 'spassky/server/html_test'
+require 'spassky/server/test_suite_container'
 require 'spassky/server/device_database'
 
 module Spassky::Server
@@ -57,8 +57,7 @@ module Spassky::Server
     end
 
     get "/test_runs/:id/run/:random/*" do
-      file_name = params[:splat].join("/")
-      get_test_file_contents params[:id], file_name
+      get_test_file_contents
     end
 
     private
@@ -79,8 +78,10 @@ module Spassky::Server
       JSON.parse(params[:contents])
     end
 
-    def get_test_file_contents test_run_id, file_name
-      HtmlTest.new(test_run.contents, idle_url, 1).get_file(file_name)
+    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, 1).get_file(file_name)
     end
 
     def save_test_result

data/lib/spassky/server/assert.js

@@ -1,5 +1,7 @@
-function assert(status, message) {
-  var img = document.createElement('img');
-  img.setAttribute('src', 'assert?status=' + (status ? 'pass' : 'fail') + '&message=' + escape(message));
-  document.body.appendChild(img);
-}
+function Spassky() {
+  this.assert = function(status, message) {
+    var img = document.createElement('img');
+    img.setAttribute('src', '{ASSERT_POST_BACK_URL}?status=' + (status ? 'pass' : 'fail') + '&message=' + escape(message));
+    document.body.appendChild(img);
+  }
+}

data/lib/spassky/server/device_database.rb

@@ -45,7 +45,7 @@ module Spassky::Server
     def uncached_device_identifier user_agent
       @stored_device_identifiers ||= {}
       if device = @wurfl[user_agent]
-        @stored_device_identifiers[user_agent] = "#{device.model_name} (id = #{device.id}, mobile_browser = #{device.mobile_browser}, device_os_version = #{device.device_os_version})"
+        @stored_device_identifiers[user_agent] = "#{device.model_name} (id = #{device[:id]}, mobile_browser = #{device.mobile_browser}, device_os_version = #{device.device_os_version})"
       else
         @stored_device_identifiers[user_agent] = user_agent
       end

data/lib/spassky/server/{html_test.rb → test_suite_container.rb}

@@ -1,8 +1,9 @@
 module Spassky::Server
-  class HtmlTest
-    def initialize(contents, url, seconds)
+  class TestSuiteContainer
+    def initialize(contents, next_url_to_redirect_to, assert_post_back_url, seconds)
       @contents = contents
-      @url = url
+      @next_url_to_redirect_to = next_url_to_redirect_to
+      @assert_post_back_url = assert_post_back_url
       @seconds = seconds
     end
 
@@ -19,11 +20,12 @@ module Spassky::Server
 
     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)
       "<script type=\"text/javascript\">#{assert_js}</script>"
     end
 
     def meta_refresh_tag
-      "<meta http-equiv=\"refresh\" content=\"#{@seconds}; url='#{@url}'\">"
+      "<meta http-equiv=\"refresh\" content=\"#{@seconds}; url='#{@next_url_to_redirect_to}'\">"
     end
   end
 end

data/lib/spassky/test_suite_result_summariser.rb

@@ -6,12 +6,9 @@ module Spassky
 
     def summary
       statuses = []
-      {"pass" => "passed", "fail" => "failed", "timed out" => "timed out"}.each do |status, description|
-        status_count = status_count status
-        if status_count > 0
-          statuses << "#{status_count} #{description}"
-        end
-      end
+      statuses << "#{status_count("pass")} passed" if status_count("pass") > 0
+      statuses << "#{status_count("fail")} failed" if status_count("fail") > 0
+      statuses << "#{status_count("timed out")} timed out" if status_count("timed out") > 0
       statuses.join ", "
     end
 

data/lib/spassky/version.rb

@@ -1,3 +1,3 @@
 module Spassky
-  VERSION = '0.1.37'
+  VERSION = '0.1.38'
 end

data/spassky.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'sinatra'
   s.add_dependency 'rainbow'
   s.add_dependency 'wurfl-lite'
-  s.add_dependency 'commandable'
+  s.add_dependency 'trollop'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'

data/spec/spassky/server/app_spec.rb

@@ -93,52 +93,14 @@ module Spassky::Server
     end
 
     describe "GET /test_runs/:id/run/:random/path/to/file" do
-      before do
-        @test_contents = {
-          "test_file.js"        => "some javascript",
-          "fake_test.html.file" => "don't choose this one",
-          "test_name.html"      => "actual test!",
-          "directory/another_directory/filename.txt" => "file 1 contents"
-        }
-      end
-
-      context "file name is a file" do
-        it "returns the specified file" do
-          test = mock(:test, :name => "fake_test.html.file", :contents => @test_contents)
-          TestRun.stub!(:find).with('123').and_return(test)
-          get "/test_runs/123/run/random/fake_test.html.file"
-          last_response.body.should include("don't choose this one")
-        end
-      end
-
-      context "with a file that is in a subdirectory" do
-        it "returns the file" do
-          test = mock(:test, :name => "test_name", :contents => @test_contents)
-          TestRun.stub!(:find).and_return(test)
-          get "/test_runs/123/run/random/directory/another_directory/filename.txt"
-          last_response.body.should include "file 1 contents"
-        end
-      end
-
-      describe "when the test contents includes a </head> tag" do
-        before do
-          @test_contents["test_name.html"] = "</head>"
-          @test = mock(:test, :name => "test_name", :contents => @test_contents)
-          TestRun.stub!(:find).with('123').and_return(@test)
-        end
-
-        it "adds a meta-refresh tag to the test contents" do
-          RandomStringGenerator.stub!(:random_string).and_return("next-iteration")
-          get "/test_runs/123/run/random/test_name.html"
-          url = "/device/idle/next-iteration"
-          last_response.body.should include("<meta http-equiv=\"refresh\" content=\"1; url='#{url}'\"></head>")
-        end
-
-        it "adds the assert.js script to the head" do
-          File.stub!(:read).and_return("assert.js!")
-          get "/test_runs/123/run/random/test_name.html"
-          last_response.body.should include("<script type=\"text/javascript\">assert.js!</script>")
-        end
+      it "gets the contents of the file" do
+        test = mock(:test, :name => "fake_test.html.file", :contents => {})
+        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", 1).and_return html_test
+        get "/test_runs/123/run/random/fake_test.html.file"
+        last_response.body.should == "contents"
       end
     end
 

data/spec/spassky/server/device_database_spec.rb

@@ -16,11 +16,6 @@ module Spassky::Server
     end
 
     context ".new" do
-      it "creates the wurfl directory" do
-        FileUtils.should_receive(:mkdir_p).with(Spassky::Server::WURFL_DIRECTORY)
-        DeviceDatabase.new
-      end
-
       it "loads up the wurfl database" do
         wurfl = mock(:wurfl).as_null_object
         WURFL.should_receive(:new).with(Spassky::Server::WURFL_FILE).and_return(wurfl)
@@ -56,7 +51,7 @@ module Spassky::Server
         it "returns the device identifier" do
           device = mock(:device)
           device.stub!(:model_name).and_return "MODEL"
-          device.stub!(:id).and_return "ID"
+          device.stub!(:[]).with(:id).and_return("ID")
           device.stub!(:mobile_browser).and_return "BROWSER"
           device.stub!(:device_os_version).and_return "OS_VERSION"
           wurfl = mock(:wurfl)

data/spec/spassky/server/test_suite_container_spec.rb

@@ -0,0 +1,46 @@
+require "spec_helper"
+require "spassky/server/test_suite_container"
+
+module Spassky::Server
+  describe TestSuiteContainer do
+    before do
+      @test_contents = {
+        "test_file.js"        => "some javascript",
+        "fake_test.html.file" => "don't choose this one",
+        "test_name.html"      => "actual test!",
+        "directory/another_directory/filename.txt" => "file 1 contents",
+        "example_test.html"   => "</head>"
+      }
+    end
+
+    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"
+      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"
+      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>"
+      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"
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spassky
 version: !ruby/object:Gem::Version
-  version: 0.1.37
+  version: 0.1.38
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-14 00:00:00.000000000Z
+date: 2011-09-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70236430903100 !ruby/object:Gem::Requirement
+  requirement: &70310251255100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70236430903100
+  version_requirements: *70310251255100
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70236430902660 !ruby/object:Gem::Requirement
+  requirement: &70310251254640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70236430902660
+  version_requirements: *70310251254640
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70236430902140 !ruby/object:Gem::Requirement
+  requirement: &70310251254120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70236430902140
+  version_requirements: *70310251254120
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &70236430901620 !ruby/object:Gem::Requirement
+  requirement: &70310251253620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70236430901620
+  version_requirements: *70310251253620
 - !ruby/object:Gem::Dependency
   name: wurfl-lite
-  requirement: &70236430835860 !ruby/object:Gem::Requirement
+  requirement: &70310251252960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70236430835860
+  version_requirements: *70310251252960
 - !ruby/object:Gem::Dependency
-  name: commandable
-  requirement: &70236430833300 !ruby/object:Gem::Requirement
+  name: trollop
+  requirement: &70310251251840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70236430833300
+  version_requirements: *70310251251840
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70236430832880 !ruby/object:Gem::Requirement
+  requirement: &70310251251340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236430832880
+  version_requirements: *70310251251340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70236430832440 !ruby/object:Gem::Requirement
+  requirement: &70310251250800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236430832440
+  version_requirements: *70310251250800
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70236430831820 !ruby/object:Gem::Requirement
+  requirement: &70310251238380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236430831820
+  version_requirements: *70310251238380
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70236430831180 !ruby/object:Gem::Requirement
+  requirement: &70310251237700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +122,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236430831180
+  version_requirements: *70310251237700
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70236430830500 !ruby/object:Gem::Requirement
+  requirement: &70310251237280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +133,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236430830500
+  version_requirements: *70310251237280
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70236430829860 !ruby/object:Gem::Requirement
+  requirement: &70310251236860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,10 +144,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236430829860
+  version_requirements: *70310251236860
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70236430829180 !ruby/object:Gem::Requirement
+  requirement: &70310251236420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -155,7 +155,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236430829180
+  version_requirements: *70310251236420
 description: ''
 email:
 - andrew.vos@gmail.com
@@ -202,9 +202,9 @@ files:
 - lib/spassky/server/assert.js
 - lib/spassky/server/device_database.rb
 - lib/spassky/server/device_list.rb
-- lib/spassky/server/html_test.rb
 - lib/spassky/server/random_string_generator.rb
 - lib/spassky/server/test_run.rb
+- lib/spassky/server/test_suite_container.rb
 - lib/spassky/test_suite_result.rb
 - lib/spassky/test_suite_result_summariser.rb
 - lib/spassky/version.rb
@@ -222,6 +222,7 @@ files:
 - spec/spassky/server/device_list_spec.rb
 - spec/spassky/server/random_string_generator_spec.rb
 - spec/spassky/server/test_run_spec.rb
+- spec/spassky/server/test_suite_container_spec.rb
 - spec/spassky/test_suite_result_spec.rb
 - spec/spassky/test_suite_result_summariser_spec.rb
 - spec/spec_helper.rb
@@ -272,6 +273,7 @@ test_files:
 - spec/spassky/server/device_list_spec.rb
 - spec/spassky/server/random_string_generator_spec.rb
 - spec/spassky/server/test_run_spec.rb
+- spec/spassky/server/test_suite_container_spec.rb
 - spec/spassky/test_suite_result_spec.rb
 - spec/spassky/test_suite_result_summariser_spec.rb
 - spec/spec_helper.rb