spassky 0.1.33 → 0.1.34

data/README.md

@@ -1,53 +1,73 @@
-# Spassky #
-A distributed web testing tool. We use it at the BBC for testing our web apps on a wide range of mobile devices.
-
+Spassky
+=======
+A distributed web testing tool. We use it at the BBC for testing our web apps on a wide range of devices.
 
 ![Spassky](https://github.com/BBC/spassky/raw/master/spassky.jpg)
 
-# Installation #
+Installation
+------------
 
 ```
 gem install spassky
 ```
 
-# Usage #
+Usage
+-----
 
 Start the server:
 
 ```
-spassky-server
+spassky server 9191
 ```
 
 Connect some 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.
 
 Check what devices are connected to the server:
-spassky http://localhost:9191 devices
+
+```
+spassky devices http://localhost:9191
+```
 
 Run a test:
 
 ```
-spassky http://localhost:9191 html_test.html
+spassky run html_test.html http://localhost:9191
 ```
 
 Run a test with colour:
 
 ```
-spassky http://localhost:9191 html_test.html --colour
+spassky run html_test.html http://localhost:9191 --colour
 ```
 
 Run a directory that contains a test (the first .html file will be used as the test)
 
 ```
-spassky http://localhost:9191 test_directory
+spassky run test_directory http://localhost:9191
 ```
 
-## Why? ##
+Why?
+----
 We need to run automated tests on a wide range of web-enabled devices with very mixed capabilities. Some of them have JavaScript, but in many cases it's not standard and buggy. That means web testing tools targeted at desktop browsers don't tend to work very well, if at all. Spassky uses legacy techniques and as little client-side JavaScript as possible to ensure we can run tests on as many devices as possible.
 
-## How it works ##
+How it works
+------------
 Physical devices act as test agents, connected permanently to a central server using meta refresh tags. Using a command-line utility, developers execute tests against those browsers by posting to the central server. The tests themselves are plain HTML pages, that are expected to call an assert URL (e.g. by embedding an image) within a time frame. That means even devices without any JavaScript can run automated tests of some kind.
 
-## Some features that would be nice to have ##
-- Conveniently run QUnit / Jasmine / other tests
-- Run tests on a subset of agents
+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.
+
+### An example test directory:
+```
+test_name
+ |-scripts/main.js
+ |-css/main.css
+ |-test.html
+```
+
+Some features that would be nice to have
+----------------------------------------
 - Assertions on network activity (e.g. for caching tests)

data/features/list_devices.feature

@@ -8,8 +8,10 @@ Feature: List Connected Devices
     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
-    Then the output should contain:
+    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

@@ -41,6 +41,15 @@ Feature: Run HTML Tests
       """
     And the exit status should be 1
 
+  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 <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)
+      """
+    And the exit status should be 0
+
   Scenario: One passing test on one device
     Given a connected mobile device "blackberry"
     When I run "spassky run passing.html <host>" with the server host

data/features/run_qunit_tests.feature

@@ -73,3 +73,38 @@ Feature: Run QUnit Tests
       FAIL qunit_test on blackberry
       """
     And the exit status should be 1
+
+  Scenario: Support multiple levels of recursion
+    Given a file named "qunit_passing/qunit_test/another_directory/passing.js" with:
+      """
+      QUnit.done = function(result) {
+        if (result.failed > 0) {
+          assert(false, "qunit failed");
+        } else {
+          assert(true, "qunit passed");
+        }
+      };
+
+      test("it passes", function() {
+        ok(true, "it passed");
+      });
+      """
+    And a file named "qunit_passing/qunit_test/another_directory/qunit.js" with qunit.js in it
+    And a file named "qunit_passing/qunit_test/suite.html" with:
+      """
+      <html>
+        <head></head>
+        <body>
+          <h1>A QUnit Suite</h1>
+          <script type="text/javascript" src="another_directory/qunit.js"></script>
+          <script type="text/javascript" src="another_directory/passing.js"></script>
+        </body>
+      </html>
+      """
+    And a connected mobile device "blackberry"
+    When I run "spassky run qunit_passing/qunit_test <host>" with the server host
+    Then the output should contain:
+      """
+      PASS qunit_test on blackberry
+      """
+    And the exit status should be 0

data/lib/spassky/client/cli.rb

@@ -18,7 +18,7 @@ module Spassky::Client
     def run(test, server = DEFAULT_SERVER, colour = false)
       writer = colour ? ColouredWriter : DefaultWriter
       pusher = Pusher.new(server)
-      test_runner = TestRunner.new(pusher, writer.new(STDOUT), DirectoryReader.new)
+      test_runner = TestRunner.new(pusher, writer.new(STDOUT), DirectoryReader.new(test))
       test_runner.run_tests(test)
     end
 
@@ -27,6 +27,7 @@ module Spassky::Client
       Spassky::Client::DeviceListRetriever.new(server).get_connected_devices.each do |device|
         puts device
       end
+      nil
     end
 
     command "run the spassky server"

data/lib/spassky/client/directory_reader.rb

@@ -1,13 +1,30 @@
 module Spassky::Client
   class DirectoryReader
-    def read_files(pattern)
-      if File.file? pattern
-        { pattern => File.read(pattern) }
-      elsif File.directory? pattern
-        Dir.glob(pattern + "/*").inject({}) do |hash, path|
-          hash[File.basename(path)] = File.read(path)
-          hash
+
+    def initialize(pattern)
+      @pattern = pattern
+    end
+
+    def read_directory
+      Dir.glob(@pattern + "/**/*").inject({}) do |hash, path|
+        if File.file? path
+          key = path.gsub(/^#{@pattern}\//, "")
+          hash[key] = File.read(path)
         end
+        hash
+      end
+
+    end
+
+    def read_file
+      { @pattern => File.read(@pattern) }
+    end
+
+    def read_files
+      if File.file? @pattern
+        read_file
+      elsif File.directory? @pattern
+        read_directory
       end
     end
   end

data/lib/spassky/client/pusher.rb

@@ -8,10 +8,6 @@ module Spassky::Client
       @sleeper = sleeper
     end
 
-    def test_runs_url
-      test_runs_url = @server_url.gsub(/\/$/, "") + "/test_runs"
-    end
-
     def push(options)
       location = post_test(options)
       result = nil
@@ -24,14 +20,21 @@ module Spassky::Client
 
     private
 
+    def test_runs_url
+      test_runs_url = @server_url.gsub(/\/$/, "") + "/test_runs"
+    end
+
     def post_test(options)
-      location = nil
       RestClient.post(test_runs_url, options) do |response, request, result|
-        if response.code == 500
-          raise response.to_str
-        end
-        location = response.headers[:location]
+        get_redirect_location response
+      end
+    end
+
+    def get_redirect_location response
+      if response.code == 500
+        raise response.to_str
       end
+      location = response.headers[:location]
       raise "Expected #{test_runs_url} to respond with 302" unless location
       location
     end

data/lib/spassky/client/test_runner.rb

@@ -9,30 +9,29 @@ module Spassky::Client
     end
 
     def run_tests(pattern)
-      previous_test_result = nil
       test_name = File.basename(pattern)
       begin
-      @pusher.push(:name => test_name, :contents => @directory_reader.read_files(pattern).to_json) do |result|
-        handle_test_result(previous_test_result, result)
-        previous_test_result = result
-      end
+        @pusher.push(:name => test_name, :contents => @directory_reader.read_files.to_json) do |result|
+          handle_test_result(result)
+        end
       rescue => error
         @writer.write_failing(error.message)
         Kernel.exit(1)
       end
     end
 
-    def handle_test_result(previous_test_result, test_result)
-      write_in_progress_status previous_test_result, test_result
+    def handle_test_result(test_result)
+      write_in_progress_status test_result
       unless test_result.status == "in progress"
         write(test_result.status, test_result.summary)
       end
+      @previous_test_result = test_result
       write_exit_code(test_result)
     end
 
-    def write_in_progress_status previous_test_result, test_result
-      test_result.completed_since(previous_test_result).each do |device_test_status|
-        write(device_test_status.status, "#{device_test_status.status.upcase} #{device_test_status.test_name} on #{device_test_status.user_agent}")
+    def write_in_progress_status test_result
+      test_result.completed_since(@previous_test_result).each do |device_test_status|
+        write(device_test_status.status, "#{device_test_status.status.upcase} #{device_test_status.test_name} on #{device_test_status.device_id}")
       end
     end
 

data/lib/spassky/server/app.rb

@@ -24,15 +24,13 @@ module Spassky::Server
       redirect idle_url
     end
 
-    def get_device_identifier user_agent
-      SingletonDeviceDatabase.instance.device_identifier(user_agent)
+    def get_device_identifier
+      SingletonDeviceDatabase.instance.device_identifier(request.user_agent)
     end
 
     get '/device/idle/:random' do
-      device_identifier = get_device_identifier(request.user_agent)
-
-      test_run = TestRun.find_next_to_run_for_user_agent(device_identifier)
-      @device_list.update_last_connected(device_identifier)
+      test_run = TestRun.find_next_test_to_run_by_device_id(get_device_identifier)
+      @device_list.update_last_connected(get_device_identifier)
       if test_run
         redirect_to_run_tests(test_run)
       else
@@ -40,15 +38,18 @@ module Spassky::Server
       end
     end
 
+    def create_test_run
+      TestRun.create({
+        :name => params[:name],
+        :contents => JSON.parse(params[:contents]),
+        :devices => @device_list.recently_connected_devices
+      })
+    end
+
     post '/test_runs' do
       recently_connected_devices = @device_list.recently_connected_devices
       if recently_connected_devices.size > 0
-        run = TestRun.create({
-          :name => params[:name],
-          :contents => JSON.parse(params[:contents]),
-          :devices => @device_list.recently_connected_devices
-        })
-        redirect "/test_runs/#{run.id}"
+        redirect "/test_runs/#{create_test_run.id}"
       else
         halt 500, "There are no connected devices"
       end
@@ -61,20 +62,24 @@ module Spassky::Server
     end
 
     get '/test_runs/:id/run/:random/assert' do
-      TestRun.find(params[:id]).save_results_for_user_agent(
-        :user_agent => request.user_agent,
+      TestRun.find(params[:id]).save_result_for_device(
+        :device_identifier => get_device_identifier,
         :status => params[:status]
       )
     end
 
-    get '/test_runs/:id/run/:random/:file_name' do
-      test_run = TestRun.find(params[:id])
-      test_name = params[:file_name]
-      HtmlTest.new(test_run.contents, idle_url, 1).get_file(test_name)
+    get "/test_runs/:id/run/:random/*" do
+      file_name = params[:splat].join("/")
+      get_test_file_contents params[:id], file_name
     end
 
     private
 
+    def get_test_file_contents test_run_id, file_name
+      test_run = TestRun.find(params[:id])
+      HtmlTest.new(test_run.contents, idle_url, 1).get_file(file_name)
+    end
+
     def redirect_to_run_tests(test_run)
       redirect "/test_runs/#{test_run.id}/run/#{RandomStringGenerator.random_string}/#{test_run.name}"
     end
@@ -85,8 +90,8 @@ module Spassky::Server
 
     def idle_page
       "<html><head><meta http-equiv=\"refresh\" content=\"1; url='#{idle_url}'\"></head>" +
-      "<body>Idle #{RandomStringGenerator.random_string}</body>" +
-      "</html>"
+        "<body>Idle #{RandomStringGenerator.random_string}</body>" +
+        "</html>"
     end
   end
 end

data/lib/spassky/server/device_list.rb

@@ -4,13 +4,13 @@ module Spassky::Server
       @devices_and_time_last_connected = {}
     end
 
-    def update_last_connected user_agent
-      @devices_and_time_last_connected[user_agent] = Time.now
+    def update_last_connected device_id
+      @devices_and_time_last_connected[device_id] = Time.now
     end
 
     def recently_connected_devices
-      @devices_and_time_last_connected.keys.select do |user_agent|
-        Time.now.to_f - @devices_and_time_last_connected[user_agent].to_f < 3
+      @devices_and_time_last_connected.keys.select do |device_id|
+        Time.now.to_f - @devices_and_time_last_connected[device_id].to_f < 3
       end
     end
 

data/lib/spassky/server/test_run.rb

@@ -7,34 +7,34 @@ module Spassky::Server
     def initialize(options)
       @name = options[:name]
       @contents = options[:contents]
-      @status_by_user_agent = {}
+      @status_by_device_id = {}
       (options[:devices] || []).each do |device|
-        @status_by_user_agent[device] = "in progress"
+        @status_by_device_id[device] = "in progress"
       end
     end
 
-    def run_by_user_agent?(user_agent)
-      @status_by_user_agent[user_agent] != "in progress"
+    def run_by_device_id?(device_id)
+      @status_by_device_id[device_id] != "in progress"
     end
 
-    def save_results_for_user_agent(options)
+    def save_result_for_device(options)
       unless ['pass', 'fail'].include? options[:status]
         raise "#{options[:status]} is not a valid status"
       end
-      @status_by_user_agent[options[:user_agent]] = options[:status]
+      @status_by_device_id[options[:device_identifier]] = options[:status]
     end
 
-    def update_connected_devices(user_agents)
-      @status_by_user_agent.each do |user_agent, status|
-        if !user_agents.include?(user_agent) && status == "in progress"
-          @status_by_user_agent[user_agent] = "timed out"
+    def update_connected_devices(device_ids)
+      @status_by_device_id.each do |device_id, status|
+        if !device_ids.include?(device_id) && status == "in progress"
+          @status_by_device_id[device_id] = "timed out"
         end
       end
     end
 
     def result
-      Spassky::TestResult.new(@status_by_user_agent.map { |user_agent, status|
-        Spassky::DeviceTestStatus.new(user_agent, status, name)
+      Spassky::TestResult.new(@status_by_device_id.map { |device_id, status|
+        Spassky::DeviceTestStatus.new(device_id, status, name)
       })
     end
 
@@ -49,8 +49,8 @@ module Spassky::Server
       test_runs.find { |test_run| test_run.id.to_s == id.to_s  }
     end
 
-    def self.find_next_to_run_for_user_agent(user_agent)
-      test_runs.find { |test_run| test_run.run_by_user_agent?(user_agent) == false }
+    def self.find_next_test_to_run_by_device_id(device_id)
+      test_runs.find { |test_run| test_run.run_by_device_id?(device_id) == false }
     end
 
     def self.delete_all

data/lib/spassky/test_result.rb

@@ -34,7 +34,7 @@ module Spassky
         :status => "pass",
         :device_statuses => @device_statuses.map do |status|
           {
-            :user_agent => status.user_agent,
+            :device_id => status.device_id,
             :status => status.status,
             :test_name => status.test_name
           }
@@ -46,7 +46,7 @@ module Spassky
       parsed = JSON.parse(json)
       test_result = TestResult.new(
         parsed['device_statuses'].map do |t|
-          DeviceTestStatus.new(t["user_agent"], t["status"], t["test_name"])
+          DeviceTestStatus.new(t["device_id"], t["status"], t["test_name"])
         end
       )
     end
@@ -71,10 +71,10 @@ module Spassky
   end
 
   class DeviceTestStatus
-    attr_reader :user_agent, :status, :test_name
+    attr_reader :device_id, :status, :test_name
 
-    def initialize(user_agent, status, test_name)
-      @user_agent = user_agent
+    def initialize(device_id, status, test_name)
+      @device_id = device_id
       @status = status
       @test_name = test_name
     end

data/lib/spassky/version.rb

@@ -1,3 +1,3 @@
 module Spassky
-  VERSION = '0.1.33'
+  VERSION = '0.1.34'
 end

data/spec/spassky/client/directory_reader_spec.rb

@@ -2,34 +2,72 @@ require 'spassky/client/directory_reader'
 
 module Spassky::Client
   describe DirectoryReader do
+    def stub_file path
+      File.stub!(:directory?).with(path).and_return(false)
+      File.stub!(:file?).with(path).and_return(true)
+    end
+
+    def stub_directory path
+      File.stub!(:directory?).with(path).and_return(true)
+      File.stub!(:file?).with(path).and_return(false)
+    end
+
+    def add_file path, contents
+      @all_paths  ||= []
+      @all_paths << path
+      stub_file path
+      File.stub!(:read).with(path).and_return(contents)
+    end
+
+    def add_directory path
+      @all_paths  ||= []
+      @all_paths << path
+      stub_directory path
+    end
+
     context "when given a file name" do
       it "returns a hash with one file" do
         File.should_receive(:file?).and_return(true)
         File.should_receive(:read).with("foo").and_return("content")
-        DirectoryReader.new.read_files("foo").should == {
+        DirectoryReader.new("foo").read_files.should == {
           "foo" => "content"
         }
       end
     end
+
     context "when given a directory name" do
+      before do
+        stub_directory "directory"
+        @all_paths = []
+        Dir.stub!(:glob).and_return(@all_paths)
+      end
+
       it "globs for files in the specified directory" do
-        File.stub!(:file?).and_return(false)
-        File.stub!(:directory?).and_return(true)
-        Dir.should_receive(:glob).with("directory/*").and_return([])
-        DirectoryReader.new.read_files("directory")
+        Dir.should_receive(:glob).with("directory/**/*").and_return([])
+        DirectoryReader.new("directory").read_files
       end
 
+
+
       it "returns a hash with all files in that directory" do
-        File.stub!(:file?).and_return(false)
-        File.stub!(:directory?).and_return(true)
-        Dir.stub!(:glob).and_return ["directory/file1", "directory/file2"]
-        File.stub!(:read).with("directory/file1").and_return("file 1 contents")
-        File.stub!(:read).with("directory/file2").and_return("file 2 contents")
-        DirectoryReader.new.read_files("directory").should == {
+        add_file "directory/file1", "file 1 contents"
+        add_file "directory/file2", "file 2 contents"
+        DirectoryReader.new("directory").read_files.should == {
           "file1" => "file 1 contents",
           "file2" => "file 2 contents"
         }
       end
+
+      it "recursively finds files in a sub-directory" do
+        add_directory "directory/subdir"
+        add_file "directory/subdir/file.html", "file 1 contents"
+        add_file "directory/another_file.txt", "file 2 contents"
+
+        DirectoryReader.new("directory").read_files.should == {
+          "subdir/file.html" => "file 1 contents",
+          "another_file.txt" => "file 2 contents"
+        }
+      end
     end
   end
 end

data/spec/spassky/client/test_runner_spec.rb

@@ -124,8 +124,8 @@ module Spassky::Client
         @test_pusher.stub!(:push).and_yield(in_progress_one).and_yield(in_progress_two)
 
         in_progress_two.stub!(:completed_since).with(in_progress_one).and_return([
-          mock(:status_one, :status => "pass", :user_agent => "ipad", :test_name => "foo"),
-          mock(:status_one, :status => "fail", :user_agent => "iphone", :test_name => "bar")
+          mock(:status_one, :status => "pass", :device_id => "ipad", :test_name => "foo"),
+          mock(:status_one, :status => "fail", :device_id => "iphone", :test_name => "bar")
         ])
 
         @writer.should_receive(:write_passing).with("PASS foo on ipad").once

data/spec/spassky/server/app_spec.rb

@@ -56,7 +56,7 @@ module Spassky::Server
 
       context "when there are no tests to run on the connected device" do
         it "serves HTML page with a meta-refresh tag" do
-          TestRun.stub!(:find_next_to_run_for_user_agent).and_return(nil)
+          TestRun.stub!(:find_next_test_to_run_by_device_id).and_return(nil)
           RandomStringGenerator.should_receive(:random_string).and_return("next-iteration")
           get "/device/idle/123"
           last_response.body.should include("<meta http-equiv=\"refresh\" content=\"1; url='/device/idle/next-iteration'\">")
@@ -69,7 +69,7 @@ module Spassky::Server
           test = mock(:test, :contents => "test contents")
           test.stub!(:id).and_return("the-test-id")
           test.stub!(:name).and_return("the-test-name")
-          TestRun.stub!(:find_next_to_run_for_user_agent).with("anything").and_return(test)
+          TestRun.stub!(:find_next_test_to_run_by_device_id).with("anything").and_return(test)
           get '/device/idle/123'
           last_response.should be_redirect
           last_response.location.should == 'http://example.org/test_runs/the-test-id/run/a-random-string/the-test-name'
@@ -79,19 +79,22 @@ module Spassky::Server
 
     describe "GET /test_runs/:id/run/:random/assert" do
       it "saves the test result" do
+        @device_database = mock(:device_database, :device_identifier => "the device identifier")
+        SingletonDeviceDatabase.stub!(:instance).and_return(@device_database)
         test = mock(:test)
         TestRun.stub!(:find).with('123').and_return(test)
-        test.should_receive(:save_results_for_user_agent).with(:user_agent => "some user agent", :status => "pass")
+        test.should_receive(:save_result_for_device).with(:device_identifier => "the device identifier", :status => "pass")
         get "/test_runs/123/run/random/assert?status=pass"
       end
     end
 
-    describe "GET /test_runs/:id/run/:random/filename" do
+    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!"
+          "test_name.html"      => "actual test!",
+          "directory/another_directory/filename.txt" => "file 1 contents"
         }
       end
 
@@ -113,6 +116,15 @@ module Spassky::Server
         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>"

data/spec/spassky/server/test_run_spec.rb

@@ -6,13 +6,13 @@ module Spassky::Server
     before do
       TestRun.delete_all
     end
-        
+
     it "can be created and retrieved" do
       created = TestRun.create(:name => "a test", :contents => "the contents")
       retrieved = TestRun.find(created.id)
       created.should == retrieved
     end
-    
+
     it "assigns each test run a unique id" do
       test_run1 = TestRun.create(:name => "test run 1", :contents => "the contents")
       test_run2 =TestRun.create(:name => "test run 2", :contents => "the contents")
@@ -28,38 +28,38 @@ module Spassky::Server
 
     it "returns the next test to run for each device" do
       created = TestRun.create(:name => "test", :contents => "contents", :devices => ["x", "y"])
-      TestRun.find_next_to_run_for_user_agent("x").should == created
-      TestRun.find_next_to_run_for_user_agent("y").should == created 
+      TestRun.find_next_test_to_run_by_device_id("x").should == created
+      TestRun.find_next_test_to_run_by_device_id("y").should == created 
     end
-    
+
     it "only returns a test run per user agent until results are saved" do
       created = TestRun.create(:name => "another test", :contents => "the contents of the test", :devices => ["user agent 1"])
-      TestRun.find_next_to_run_for_user_agent("user agent 1").should == created
-      TestRun.find_next_to_run_for_user_agent("user agent 1").should == created
-      created.save_results_for_user_agent(:user_agent => "user agent 1", :status => "pass")
-      TestRun.find_next_to_run_for_user_agent("user agent 1").should be_nil
+      TestRun.find_next_test_to_run_by_device_id("user agent 1").should == created
+      TestRun.find_next_test_to_run_by_device_id("user agent 1").should == created
+      created.save_result_for_device(:device_identifier => "user agent 1", :status => "pass")
+      TestRun.find_next_test_to_run_by_device_id("user agent 1").should be_nil
     end
-    
+
     it "returns 'in progress' status per user agent until the results are saved" do
       created = TestRun.create(:name => "another test", :contents => "the contents of the test")
       created.result.status.should == 'in progress'
-      created.save_results_for_user_agent(:user_agent => "some user agent", :status => "pass")
+      created.save_result_for_device(:device_identifier => "some user agent", :status => "pass")
       created.result.status.should == 'pass'
     end
-    
+
     it "returns failed if the saved tests results failed" do
       created = TestRun.create(:name => "another test", :contents => "the contents of the test")
-      created.save_results_for_user_agent(:user_agent => "another user agent", :status => "fail")
+      created.save_result_for_device(:device_identifier => "another user agent", :status => "fail")
       created.result.status.should == 'fail'
     end
-    
+
     it "rejects nonsense status" do
       run = TestRun.create(:name => "another test", :contents => "the contents of the test")
       lambda {
-        run.save_results_for_user_agent(:user_agent => "another user agent", :status => "wtf?")
+        run.save_result_for_device(:device_identifier => "another user agent", :status => "wtf?")
       }.should raise_error("wtf? is not a valid status")
     end
-    
+
     it "creates an in progress test result from the device list" do
       run = TestRun.create(
         :name => "another test",
@@ -81,15 +81,15 @@ module Spassky::Server
       run.result.device_statuses.first.status.should == "in progress"
       run.result.device_statuses.last.status.should == "timed out"
     end
-    
+
     it "does not update the status of disconnected devices that have already passed or failed" do
       run = TestRun.create(
         :name => "another test",
         :contents => "the contents of the test",
         :devices => ["device1", "device2"]
       )
-      run.save_results_for_user_agent(:user_agent => "device1", :status => "pass")
-      run.save_results_for_user_agent(:user_agent => "device2", :status => "fail")
+      run.save_result_for_device(:device_identifier => "device1", :status => "pass")
+      run.save_result_for_device(:device_identifier => "device2", :status => "fail")
       run.update_connected_devices([])
       run.result.device_statuses.first.status.should == "pass"
       run.result.device_statuses.last.status.should == "fail"

data/spec/spassky/test_result_spec.rb

@@ -60,7 +60,7 @@ module Spassky
       json = test_result.to_json
       deserialized = TestResult.from_json(json)
       deserialized.device_statuses.size.should == 1
-      deserialized.device_statuses.first.user_agent.should == 'agent'
+      deserialized.device_statuses.first.device_id.should == 'agent'
       deserialized.device_statuses.first.status.should == 'pass'      
     end
 

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+ENV['RACK_ENV'] = 'test'
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 $:.unshift(File.dirname(__FILE__))
-require 'spassky'
+require 'spassky'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spassky
 version: !ruby/object:Gem::Version
-  version: 0.1.33
+  version: 0.1.34
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-02 00:00:00.000000000Z
+date: 2011-09-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2168560600 !ruby/object:Gem::Requirement
+  requirement: &70225077309240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168560600
+  version_requirements: *70225077309240
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2168560040 !ruby/object:Gem::Requirement
+  requirement: &70225077308820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168560040
+  version_requirements: *70225077308820
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2168559360 !ruby/object:Gem::Requirement
+  requirement: &70225077308400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168559360
+  version_requirements: *70225077308400
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &2168558800 !ruby/object:Gem::Requirement
+  requirement: &70225077307920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168558800
+  version_requirements: *70225077307920
 - !ruby/object:Gem::Dependency
   name: wurfl-lite
-  requirement: &2168558160 !ruby/object:Gem::Requirement
+  requirement: &70225077307440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168558160
+  version_requirements: *70225077307440
 - !ruby/object:Gem::Dependency
   name: commandable
-  requirement: &2168557360 !ruby/object:Gem::Requirement
+  requirement: &70225077271520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168557360
+  version_requirements: *70225077271520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2168556680 !ruby/object:Gem::Requirement
+  requirement: &70225077270840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168556680
+  version_requirements: *70225077270840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2168556160 !ruby/object:Gem::Requirement
+  requirement: &70225077270240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168556160
+  version_requirements: *70225077270240
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2168555260 !ruby/object:Gem::Requirement
+  requirement: &70225077269620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168555260
+  version_requirements: *70225077269620
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2168554560 !ruby/object:Gem::Requirement
+  requirement: &70225077269000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +122,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168554560
+  version_requirements: *70225077269000
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2168553980 !ruby/object:Gem::Requirement
+  requirement: &70225077268580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +133,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168553980
+  version_requirements: *70225077268580
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &2168553200 !ruby/object:Gem::Requirement
+  requirement: &70225077268160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,10 +144,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168553200
+  version_requirements: *70225077268160
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2168552160 !ruby/object:Gem::Requirement
+  requirement: &70225077267740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -155,7 +155,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168552160
+  version_requirements: *70225077267740
 description: ''
 email:
 - andrew.vos@gmail.com
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: spassky
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: ''