spassky 0.1.36 → 0.1.37

data/spec/spassky/client/{test_runner_spec.rb → test_suite_runner_spec.rb}

@@ -1,8 +1,8 @@
 require 'spec_helper'
-require 'spassky/client/test_runner'
+require 'spassky/client/test_suite_runner'
 
 module Spassky::Client
-  describe TestRunner do
+  describe TestSuiteRunner do
     before do
       @test_pusher = mock(:test_pusher)
       @writer = mock(:writer)
@@ -11,73 +11,73 @@ module Spassky::Client
       Kernel.stub!(:exit)
       @directory_reader = mock(:directory_reader)
       @directory_reader.stub!(:read_files).and_return({ "test.html" => "contents" })
-      @test_runner = TestRunner.new(@test_pusher, @writer, @directory_reader)
+      @test_suite_runner = TestSuiteRunner.new(@test_pusher, @writer, @directory_reader)
     end
 
-    def new_test_result status, summary
-      test_result = mock :"#{status.gsub(" ", "_")}_test_result"
-      test_result.stub!(:status).and_return status
-      test_result.stub!(:summary).and_return summary
-      test_result.stub!(:completed_since).and_return([])
-      test_result
+    def new_test_suite_result status, summary
+      test_suite_result = mock :"#{status.gsub(" ", "_")}_test_suite_result"
+      test_suite_result.stub!(:status).and_return status
+      test_suite_result.stub!(:summary).and_return summary
+      test_suite_result.stub!(:completed_since).and_return([])
+      test_suite_result
     end
 
-    def new_in_progress_test_result
-      new_test_result "in progress", "in progress summary"
+    def new_in_progress_test_suite_result
+      new_test_suite_result "in progress", "in progress summary"
     end
 
-    def new_passed_test_result
-      new_test_result "pass", "pass summary"
+    def new_passed_test_suite_result
+      new_test_suite_result "pass", "pass summary"
     end
 
-    def new_failed_test_result
-      new_test_result "fail", "fail summary"
+    def new_failed_test_suite_result
+      new_test_suite_result "fail", "fail summary"
     end
 
-    def new_timeout_test_result
-      new_test_result "timed out", "timed out summary"
+    def new_timeout_test_suite_result
+      new_test_suite_result "timed out", "timed out summary"
     end
 
     it "reads a test" do
       @test_pusher.stub!(:push)
       @directory_reader.should_receive(:read_files).and_return(:file_body)
-      @test_runner.run_tests("foo_test", "test name")
+      @test_suite_runner.run_test_suite("foo_test", "test name")
     end
 
     it "pushes the test" do
       @test_pusher.should_receive(:push).with({:name => 'foo_test', :contents => { "test.html" => "contents" }.to_json })
-      @test_runner.run_tests("path/to/test", "foo_test")
+      @test_suite_runner.run_test_suite("path/to/test", "foo_test")
     end
 
     context "timeout" do
       it 'returns a exit status of 2' do
-        @test_pusher.stub!(:push).and_yield(new_timeout_test_result)
+        @test_pusher.stub!(:push).and_yield(new_timeout_test_suite_result)
         Kernel.should_receive(:exit).with(2)
-        @test_runner.run_tests("foo_test", "test name")
+        @test_suite_runner.run_test_suite("foo_test", "test name")
       end
     end
 
     context "failing test" do
       before do
-        @test_pusher.stub!(:push).and_yield(new_failed_test_result)
+        @test_pusher.stub!(:push).and_yield(new_failed_test_suite_result)
       end
 
       it "only writes once" do
         @writer.should_receive(:write_failing).once
-        @test_runner.run_tests("foo_test", "test name")
+        @test_suite_runner.run_test_suite("foo_test", "test name")
       end
 
       it "writes out an error code" do
         Kernel.should_receive(:exit).with(1)
-        @test_runner.run_tests("foo_test", "test name")
+        @test_suite_runner.run_test_suite("foo_test", "test name")
       end
     end
 
     context "passing test" do
       it "writes passing output" do
-        @test_pusher.stub!(:push).and_yield(new_passed_test_result)
+        @test_pusher.stub!(:push).and_yield(new_passed_test_suite_result)
         @writer.should_receive(:write_passing).with("pass summary")
-        @test_runner.run_tests("foo_test", "test name")
+        @test_suite_runner.run_test_suite("foo_test", "test name")
       end
     end
 
@@ -88,57 +88,57 @@ module Spassky::Client
 
       it "writes out the error" do
         @writer.should_receive(:write_failing).with("hell")
-        @test_runner.run_tests("foo_test", "test name")
+        @test_suite_runner.run_test_suite("foo_test", "test name")
       end
 
       it "exits with an error code" do
         Kernel.should_receive(:exit).with(1)
-        @test_runner.run_tests("foo_test", "test name")
+        @test_suite_runner.run_test_suite("foo_test", "test name")
       end
     end
 
     context "in progress" do
       it "writes nothing" do
-        @test_pusher.stub!(:push).and_yield(new_in_progress_test_result)
+        @test_pusher.stub!(:push).and_yield(new_in_progress_test_suite_result)
         @writer = mock(:writer)
         @writer.should_not_receive(:write_passing)
         @writer.should_not_receive(:write_failing)
-        TestRunner.new(@test_pusher, @writer, @directory_reader).run_tests("foo_test", "test name")
+        TestSuiteRunner.new(@test_pusher, @writer, @directory_reader).run_test_suite("foo_test", "test name")
       end
     end
 
     context "in progress, then passed result yielded" do
       it "only writes out the summary when the status is not 'in progress'" do
-        in_progress_test_result = new_in_progress_test_result
-        pass_test_result        = new_passed_test_result
-        @test_pusher.stub!(:push).and_yield(in_progress_test_result).and_yield(pass_test_result)
+        in_progress_test_suite_result = new_in_progress_test_suite_result
+        pass_test_suite_result        = new_passed_test_suite_result
+        @test_pusher.stub!(:push).and_yield(in_progress_test_suite_result).and_yield(pass_test_suite_result)
         @writer.should_receive(:write_passing).with("pass summary").once
-        @test_runner.run_tests("foo_test", "test name")
+        @test_suite_runner.run_test_suite("foo_test", "test name")
       end
     end
 
     context "in progress twice then passed result yielded" do
       it "writes the difference between test results on each iteration" do
-        in_progress_one = new_in_progress_test_result
-        in_progress_two = new_in_progress_test_result
+        in_progress_one = new_in_progress_test_suite_result
+        in_progress_two = new_in_progress_test_suite_result
         @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", :device_id => "ipad", :test_name => "foo", :message => "test_result"),
-          mock(:status_one, :status => "fail", :device_id => "iphone", :test_name => "bar", :message => "test_result")
+          mock(:status_one, :status => "pass", :device_id => "ipad", :test_name => "foo", :message => "test_suite_result"),
+          mock(:status_one, :status => "fail", :device_id => "iphone", :test_name => "bar", :message => "test_suite_result")
         ])
 
         @writer.should_receive(:write_passing).with("PASS foo on ipad").once
         @writer.should_receive(:write_failing).with("FAIL bar on iphone").once
 
-        @test_runner.run_tests("foo bar", "test name")
+        @test_suite_runner.run_test_suite("foo bar", "test name")
       end
     end
 
     context "failed result yielded" do
       it "writes out the test message" do
-        in_progress_one = new_in_progress_test_result
-        in_progress_two = new_in_progress_test_result
+        in_progress_one = new_in_progress_test_suite_result
+        in_progress_two = new_in_progress_test_suite_result
         @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([
@@ -147,7 +147,7 @@ module Spassky::Client
 
         @writer.should_receive(:write_failing).with("test result message").once
 
-        @test_runner.run_tests("foo bar", "test name")
+        @test_suite_runner.run_test_suite("foo bar", "test name")
       end
     end
   end

data/spec/spassky/server/app_spec.rb

@@ -86,9 +86,9 @@ module Spassky::Server
         test.should_receive(:save_result_for_device).with(
           :device_identifier => "the device identifier",
           :status            => "pass",
-          :message           => "the_test_result_message"
+          :message           => "the_test_suite_result_message"
         )
-        get "/test_runs/123/run/random/assert?status=pass&message=the_test_result_message"
+        get "/test_runs/123/run/random/assert?status=pass&message=the_test_suite_result_message"
       end
     end
 
@@ -188,9 +188,9 @@ module Spassky::Server
     describe "GET /test_runs/123" do
       it "returns the status of the test with the id '123'" do
         test_run = mock(:test_run)
-        test_result = mock(:test_result)
-        test_result.stub!(:to_json).and_return("the test run as json")
-        test_run.stub!(:result).and_return(test_result)
+        test_suite_result = mock(:test_suite_result)
+        test_suite_result.stub!(:to_json).and_return("the test run as json")
+        test_run.stub!(:result).and_return(test_suite_result)
         test_run.stub!(:update_connected_devices)
         TestRun.should_receive(:find).with('123').and_return test_run
         get '/test_runs/123'
@@ -199,9 +199,9 @@ module Spassky::Server
 
       it "tells the test run which devices are still connected" do
         test_run = mock(:test_run)
-        test_result = mock(:test_result)
-        test_result.stub!(:to_json).and_return("the test run as json")
-        test_run.stub!(:result).and_return(test_result)
+        test_suite_result = mock(:test_suite_result)
+        test_suite_result.stub!(:to_json).and_return("the test run as json")
+        test_run.stub!(:result).and_return(test_suite_result)
         TestRun.stub!(:find).with('123').and_return test_run
         still_connected_devices = ["device1", "device2"]
         device_list.stub!(:recently_connected_devices).and_return(still_connected_devices)

data/spec/spassky/server/device_database_spec.rb

@@ -75,15 +75,5 @@ module Spassky::Server
         end
       end
     end
-
-    context "request device that exists" do
-      it "returns a device" do
-        wurfl = mock :wurfl
-        device = mock :device
-        wurfl.stub!(:[]).and_return(device)
-        WURFL.stub!(:new).and_return(wurfl)
-        DeviceDatabase.new.device("user agent").should == (device)
-      end
-    end
   end
 end

data/spec/spassky/{test_result_spec.rb → test_suite_result_spec.rb}

@@ -1,11 +1,11 @@
 require 'spec_helper'
-require 'spassky/test_result'
+require 'spassky/test_suite_result'
 
 module Spassky
-  describe TestResult do
+  describe TestSuiteResult do
     context "when no devices are connected" do
       it "is in progress" do
-        TestResult.new([]).status.should == "in progress"
+        TestSuiteResult.new([]).status.should == "in progress"
       end
     end
 
@@ -13,13 +13,13 @@ module Spassky
       device_statuses = stub(:device_statuses)
       test_result_summariser = stub(:test_result_summariser)
       test_result_summariser.stub!(:summary).and_return("the summary")
-      TestResultSummariser.stub!(:new).with(device_statuses).and_return(test_result_summariser)
-      TestResult.new(device_statuses).summary.should == "the summary"
+      TestSuiteResultSummariser.stub!(:new).with(device_statuses).and_return(test_result_summariser)
+      TestSuiteResult.new(device_statuses).summary.should == "the summary"
     end
 
     context "when all devices pass" do
       it "is a pass" do
-        TestResult.new([
+        TestSuiteResult.new([
           FactoryGirl.build(:device_test_status),
           FactoryGirl.build(:device_test_status)
         ]).status.should == "pass"
@@ -28,7 +28,7 @@ module Spassky
 
     context "when any device fails" do
       it "is a fail" do
-        TestResult.new([
+        TestSuiteResult.new([
           FactoryGirl.build(:device_test_status),
           FactoryGirl.build(:device_test_status, :status => 'fail')
         ]).status.should == "fail"
@@ -37,7 +37,7 @@ module Spassky
 
     context "when any test is still in progress" do
       it "is a fail" do
-        TestResult.new([
+        TestSuiteResult.new([
           FactoryGirl.build(:device_test_status),
           FactoryGirl.build(:device_test_status, :status => 'fail'),
           FactoryGirl.build(:device_test_status, :status => 'in progress')
@@ -47,19 +47,19 @@ module Spassky
 
     context "when 1 test times out" do
       it "has the status 'timed out'" do
-        test_result = TestResult.new([
+        test_suite_result = TestSuiteResult.new([
           FactoryGirl.build(:device_test_status, :status => 'timed out'),
           FactoryGirl.build(:device_test_status)
         ])
-        test_result.status.should == "timed out"
+        test_suite_result.status.should == "timed out"
       end
     end
 
     it "can be serialized and deserialized" do
       device_test_statuses = [FactoryGirl.build(:device_test_status)]
-      test_result = TestResult.new(device_test_statuses)
-      json = test_result.to_json
-      deserialized = TestResult.from_json(json)
+      test_suite_result = TestSuiteResult.new(device_test_statuses)
+      json = test_suite_result.to_json
+      deserialized = TestSuiteResult.from_json(json)
       deserialized.device_statuses.size.should == 1
       deserialized.device_statuses.first.device_id.should == device_test_statuses.first.device_id
       deserialized.device_statuses.first.status.should    == device_test_statuses.first.status
@@ -71,12 +71,12 @@ module Spassky
         status_1 = FactoryGirl.build(:device_test_status)
         status_2 = FactoryGirl.build(:device_test_status, :status => 'in progress', :test_name => 'test2')
         status_3 = FactoryGirl.build(:device_test_status, :status => 'fail',        :test_name => 'test3')
-        test_result = TestResult.new([status_1, status_2, status_3])
-        test_result.completed_since(nil).should == [status_1, status_3]
+        test_suite_result = TestSuiteResult.new([status_1, status_2, status_3])
+        test_suite_result.completed_since(nil).should == [status_1, status_3]
       end
     end
 
-    describe "#completed_since(other_test_result)" do
+    describe "#completed_since(other_test_suite_result)" do
       it "returns all device test results that are no longer in progress" do
         status_a1 = FactoryGirl.build(:device_test_status, :status => 'pass',        :test_name => 'test1')
         status_a2 = FactoryGirl.build(:device_test_status, :status => 'in progress', :test_name => 'test2')
@@ -85,10 +85,10 @@ module Spassky
         status_b2 = FactoryGirl.build(:device_test_status, :status => 'fail',        :test_name => 'test2')
         status_b3 = FactoryGirl.build(:device_test_status, :status => 'timed out',   :test_name => 'test3')
 
-        test_result_before = TestResult.new([status_a1, status_a2, status_a3])
-        test_result_after  = TestResult.new([status_b1, status_b2, status_b3])
+        test_suite_result_before = TestSuiteResult.new([status_a1, status_a2, status_a3])
+        test_suite_result_after  = TestSuiteResult.new([status_b1, status_b2, status_b3])
 
-        test_result_after.completed_since(test_result_before).should == [status_b2, status_b3]
+        test_suite_result_after.completed_since(test_suite_result_before).should == [status_b2, status_b3]
       end
     end
   end

data/spec/spassky/{test_result_summariser_spec.rb → test_suite_result_summariser_spec.rb}

@@ -1,13 +1,13 @@
 require "spec_helper"
 
 module Spassky
-  describe TestResultSummariser do
+  describe TestSuiteResultSummariser do
     it "shows passing tests" do
       device_statuses = [
         FactoryGirl.build(:device_test_status),
         FactoryGirl.build(:device_test_status)
       ]
-      TestResultSummariser.new(device_statuses).summary.should == "2 passed"
+      TestSuiteResultSummariser.new(device_statuses).summary.should == "2 passed"
     end
 
     it "shows failing tests" do
@@ -15,7 +15,7 @@ module Spassky
         FactoryGirl.build(:device_test_status, :status => 'fail'),
         FactoryGirl.build(:device_test_status, :status => 'fail')
       ]
-      TestResultSummariser.new(device_statuses).summary.should == "2 failed"
+      TestSuiteResultSummariser.new(device_statuses).summary.should == "2 failed"
     end
 
     it "shows timed out tests" do
@@ -23,7 +23,7 @@ module Spassky
         FactoryGirl.build(:device_test_status, :status => 'timed out'),
         FactoryGirl.build(:device_test_status, :status => 'timed out')
       ]
-      TestResultSummariser.new(device_statuses).summary.should == "2 timed out"
+      TestSuiteResultSummariser.new(device_statuses).summary.should == "2 timed out"
     end
 
     it "shows failed, passed and timed out tests" do
@@ -35,7 +35,7 @@ module Spassky
         FactoryGirl.build(:device_test_status, :status => 'timed out'),
         FactoryGirl.build(:device_test_status, :status => 'timed out')
       ]
-      TestResultSummariser.new(device_statuses).summary.should == "2 passed, 2 failed, 2 timed out"
+      TestSuiteResultSummariser.new(device_statuses).summary.should == "2 passed, 2 failed, 2 timed out"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spassky
 version: !ruby/object:Gem::Version
-  version: 0.1.36
+  version: 0.1.37
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-09 00:00:00.000000000Z
+date: 2011-09-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70322539873180 !ruby/object:Gem::Requirement
+  requirement: &70236430903100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70322539873180
+  version_requirements: *70236430903100
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70322539872120 !ruby/object:Gem::Requirement
+  requirement: &70236430902660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70322539872120
+  version_requirements: *70236430902660
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70322539870440 !ruby/object:Gem::Requirement
+  requirement: &70236430902140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70322539870440
+  version_requirements: *70236430902140
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &70322539868280 !ruby/object:Gem::Requirement
+  requirement: &70236430901620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70322539868280
+  version_requirements: *70236430901620
 - !ruby/object:Gem::Dependency
   name: wurfl-lite
-  requirement: &70322539867280 !ruby/object:Gem::Requirement
+  requirement: &70236430835860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70322539867280
+  version_requirements: *70236430835860
 - !ruby/object:Gem::Dependency
   name: commandable
-  requirement: &70322539866380 !ruby/object:Gem::Requirement
+  requirement: &70236430833300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70322539866380
+  version_requirements: *70236430833300
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70322539865040 !ruby/object:Gem::Requirement
+  requirement: &70236430832880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322539865040
+  version_requirements: *70236430832880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70322539863940 !ruby/object:Gem::Requirement
+  requirement: &70236430832440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322539863940
+  version_requirements: *70236430832440
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70322539863140 !ruby/object:Gem::Requirement
+  requirement: &70236430831820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322539863140
+  version_requirements: *70236430831820
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70322539861800 !ruby/object:Gem::Requirement
+  requirement: &70236430831180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +122,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322539861800
+  version_requirements: *70236430831180
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70322539860960 !ruby/object:Gem::Requirement
+  requirement: &70236430830500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +133,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322539860960
+  version_requirements: *70236430830500
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70322539859900 !ruby/object:Gem::Requirement
+  requirement: &70236430829860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,21 +144,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322539859900
-- !ruby/object:Gem::Dependency
-  name: ruby-debug19
-  requirement: &70322539858760 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70322539858760
+  version_requirements: *70236430829860
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70322539857760 !ruby/object:Gem::Requirement
+  requirement: &70236430829180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,7 +155,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322539857760
+  version_requirements: *70236430829180
 description: ''
 email:
 - andrew.vos@gmail.com
@@ -205,7 +194,7 @@ files:
 - lib/spassky/client/device_list_retriever.rb
 - lib/spassky/client/directory_reader.rb
 - lib/spassky/client/pusher.rb
-- lib/spassky/client/test_runner.rb
+- lib/spassky/client/test_suite_runner.rb
 - lib/spassky/client/writer.rb
 - lib/spassky/device_test_status.rb
 - lib/spassky/server.rb
@@ -216,8 +205,8 @@ files:
 - lib/spassky/server/html_test.rb
 - lib/spassky/server/random_string_generator.rb
 - lib/spassky/server/test_run.rb
-- lib/spassky/test_result.rb
-- lib/spassky/test_result_summariser.rb
+- lib/spassky/test_suite_result.rb
+- lib/spassky/test_suite_result_summariser.rb
 - lib/spassky/version.rb
 - spassky.gemspec
 - spassky.jpg
@@ -226,15 +215,15 @@ files:
 - spec/spassky/client/device_list_retriever_spec.rb
 - spec/spassky/client/directory_reader_spec.rb
 - spec/spassky/client/pusher_spec.rb
-- spec/spassky/client/test_runner_spec.rb
+- spec/spassky/client/test_suite_runner_spec.rb
 - spec/spassky/client/writer_spec.rb
 - spec/spassky/server/app_spec.rb
 - spec/spassky/server/device_database_spec.rb
 - spec/spassky/server/device_list_spec.rb
 - spec/spassky/server/random_string_generator_spec.rb
 - spec/spassky/server/test_run_spec.rb
-- spec/spassky/test_result_spec.rb
-- spec/spassky/test_result_summariser_spec.rb
+- spec/spassky/test_suite_result_spec.rb
+- spec/spassky/test_suite_result_summariser_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/BBC/spassky
 licenses: []
@@ -276,13 +265,13 @@ test_files:
 - spec/spassky/client/device_list_retriever_spec.rb
 - spec/spassky/client/directory_reader_spec.rb
 - spec/spassky/client/pusher_spec.rb
-- spec/spassky/client/test_runner_spec.rb
+- spec/spassky/client/test_suite_runner_spec.rb
 - spec/spassky/client/writer_spec.rb
 - spec/spassky/server/app_spec.rb
 - spec/spassky/server/device_database_spec.rb
 - spec/spassky/server/device_list_spec.rb
 - spec/spassky/server/random_string_generator_spec.rb
 - spec/spassky/server/test_run_spec.rb
-- spec/spassky/test_result_spec.rb
-- spec/spassky/test_result_summariser_spec.rb
+- spec/spassky/test_suite_result_spec.rb
+- spec/spassky/test_suite_result_summariser_spec.rb
 - spec/spec_helper.rb