spassky 0.1.0 → 0.1.1

data/spec/spassky/server/app_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-
 require 'capybara'
 require 'capybara/dsl'
 require 'rack/test'
@@ -14,6 +13,7 @@ module Spassky::Server
 
     before do
       RandomStringGenerator.stub!(:random_string).and_return("random-string")
+      header "User-Agent", "some user agent"
     end
 
     def app
@@ -33,11 +33,24 @@ module Spassky::Server
       end
     end
 
+    describe "GET /devices/list" do
+      it "returns a list of devices" do
+        devices = ["iphone", "nokia"]
+        device_list.should_receive(:recently_connected_devices).and_return(devices)
+        get "/devices/list"
+        last_response.body.should == devices.to_json
+      end
+    end
+
     describe "GET /device/idle/123" do
+      before do
+        @device_database = mock :device_database
+        SingletonDeviceDatabase.stub!(:instance).and_return(@device_database)
+        @device_database.stub!(:device_identifier).and_return("anything")
+      end
 
-      it "tells the device list that the device connected" do
-        device_list.should_receive(:update_last_connected).with("some user agent")
-        header "User-Agent", "some user agent"
+      it "tells the device list that the device connected using the device identifier" do
+        device_list.should_receive(:update_last_connected).with("anything")
         get "/device/idle/123"
       end
 
@@ -56,8 +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("some user agent").and_return(test)
-          header "User-Agent", "some user agent"
+          TestRun.stub!(:find_next_to_run_for_user_agent).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'
@@ -69,8 +81,7 @@ module Spassky::Server
       it "saves the test result" do
         test = mock(:test)
         TestRun.stub!(:find).with('123').and_return(test)
-        header "User-Agent", "the user agent"
-        test.should_receive(:save_results_for_user_agent).with(:user_agent => "the user agent", :status => "pass")
+        test.should_receive(:save_results_for_user_agent).with(:user_agent => "some user agent", :status => "pass")
         get "/test_runs/123/run/random/assert?status=pass"
       end
     end
@@ -88,7 +99,6 @@ module Spassky::Server
         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)
-          header "User-Agent", "some user agent"
           get "/test_runs/123/run/random/fake_test.html.file"
           last_response.body.should include("don't choose this one")
         end
@@ -98,7 +108,6 @@ module Spassky::Server
         it "returns the first file that ends with .html" do
           test = mock(:test, :name => "directory/test_name.html", :contents => @test_contents)
           TestRun.stub!(:find).with('123').and_return(test)
-          header "User-Agent", "some user agent"
           get "/test_runs/123/run/random/not_a_file"
           last_response.body.should include("actual test!")
         end
@@ -136,6 +145,27 @@ module Spassky::Server
         @test_contents = {"file1" => "file1 contents", "file2" => "file2 contents"}
       end
 
+      context "no devices connected" do
+        before do
+          device_list.stub!(:recently_connected_devices).and_return([])
+        end
+
+        it "does not create a test run" do
+          TestRun.should_not_receive(:create)
+          post "/test_runs", { :name => "first-test", :contents => @test_contents.to_json }
+        end
+
+        it "halts with a 500" do
+          post "/test_runs", { :name => "first-test", :contents => @test_contents.to_json }
+          last_response.status.should == 500
+        end
+
+        it "displays the error" do
+          post "/test_runs", { :name => "first-test", :contents => @test_contents.to_json }
+          last_response.body.should == "There are no connected devices"
+        end
+      end
+
       it "creates a test run" do
         TestRun.should_receive(:create).with(:name => "first-test", :contents => @test_contents, :devices => ["foo", "bar"])
         post "/test_runs", { :name => "first-test", :contents => @test_contents.to_json }

data/spec/spassky/server/device_database_spec.rb

@@ -0,0 +1,76 @@
+require "spassky/server/device_database"
+require "ostruct"
+require "fakefs/safe"
+
+module Spassky::Server
+  describe DeviceDatabase do
+    before do
+      WURFL.stub!(:new).and_return(nil)
+      RestClient.stub!(:get)
+      Kernel.stub!(:puts)
+      FakeFS.activate!
+    end
+
+    after do
+      FakeFS.deactivate!
+    end
+
+    context ".new" do
+      it "loads up the wurfl database" do
+        wurfl = mock(:wurfl).as_null_object
+        WURFL.should_receive(:new).with("wurfl/wurfl-latest.xml.gz").and_return(wurfl)
+        DeviceDatabase.new
+      end
+
+      it "tells the user that it is going to download a new wurfl database" do
+        Kernel.should_receive(:puts).with("Downloading WURFL database")
+        File.delete(Spassky::Server::WURFL_FILE)
+        DeviceDatabase.new
+      end
+
+      it "downloads a new wurfl database if it doesn't exist" do
+        File.delete(Spassky::Server::WURFL_FILE)
+        RestClient.should_receive(:get).with(Spassky::Server::LATEST).and_return("file content")
+        DeviceDatabase.new
+        File.read(Spassky::Server::WURFL_FILE).should == "file content"
+      end
+    end
+
+    describe ".device_identifier" do
+      subject { DeviceDatabase.new }
+
+      context "existing device" do
+        it "returns the device identifier" do
+          device = mock(:device)
+          device.stub!(:model_name).and_return "MODEL"
+          device.stub!(:id).and_return "ID"
+          device.stub!(:mobile_browser).and_return "BROWSER"
+          device.stub!(:device_os_version).and_return "OS_VERSION"
+          wurfl = mock(:wurfl)
+          wurfl.should_receive(:[]).and_return(device)
+          WURFL.should_receive(:new).and_return(wurfl)
+          subject.device_identifier("user agent").should == "MODEL (id = ID, mobile_browser = BROWSER, device_os_version = OS_VERSION)"
+        end
+      end
+
+      context "device deosn't exist in the database" do
+        it "returns user-agent" do
+          wurfl = mock(:wurfl)
+          wurfl.should_receive(:[]).and_return(nil)
+          WURFL.stub!(:new).and_return(wurfl)
+          subject.device_identifier("user agent").should == "user agent"
+        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/server/device_list_spec.rb

@@ -3,30 +3,33 @@ require 'spassky/server/device_list'
 
 module Spassky::Server
   describe DeviceList do
+    subject { DeviceList.new }
+
+    it "doesn't blow up when I get the recently connected devices" do
+      subject.recently_connected_devices.should == []
+    end
+
     it "keeps track of when devices last connected" do
-      list = DeviceList.new
-      list.update_last_connected("foo")
-      list.update_last_connected("bar")
-      list.recently_connected_devices.should == ["foo", "bar"]
+      subject.update_last_connected("foo")
+      subject.update_last_connected("bar")
+      subject.recently_connected_devices.should == ["foo", "bar"]
     end
-    
+
     it "clears all devices" do
-      list = DeviceList.new
-      list.update_last_connected("foo")
-      list.update_last_connected("bar")
-      list.clear
-      list.recently_connected_devices.size.should == 0
+      subject.update_last_connected("foo")
+      subject.update_last_connected("bar")
+      subject.clear
+      subject.recently_connected_devices.size.should == 0
     end
-    
+
     it "ignores devices connected more than 3 seconds ago" do
-      list = DeviceList.new
       now = Time.now
       Time.stub!(:now).and_return(now - 3)
-      list.update_last_connected("a")
+      subject.update_last_connected("a")
       Time.stub!(:now).and_return(now - 2)
-      list.update_last_connected("b")
+      subject.update_last_connected("b")
       Time.stub!(:now).and_return(now)
-      list.recently_connected_devices.should == ["b"]
+      subject.recently_connected_devices.should == ["b"]
     end
   end
-end
+end

data/spec/spassky/test_result_spec.rb

@@ -8,7 +8,7 @@ module Spassky
         TestResult.new([]).status.should == "in progress"
       end
     end
-    
+
     context "when one device passes" do
       it "outputs a summary" do
         test_result = TestResult.new([
@@ -25,7 +25,7 @@ module Spassky
           Spassky::DeviceTestStatus.new('agent2', 'pass', 'test')
         ]).status.should == "pass"
       end
-      
+
       it "outputs a pluralised summary" do
         test_result = TestResult.new([
           Spassky::DeviceTestStatus.new('agent1', 'pass', 'test'),
@@ -34,7 +34,7 @@ module Spassky
         test_result.summary.should == "1 test passed on 2 devices"
       end
     end
-    
+
     context "when any device fails" do
       it "is a fail" do
         TestResult.new([
@@ -42,7 +42,7 @@ module Spassky
           Spassky::DeviceTestStatus.new('agent2', 'fail', 'test')
         ]).status.should == "fail"
       end
-      
+
       it "outputs a summary" do
         test_result = TestResult.new([
           Spassky::DeviceTestStatus.new('agent1', 'fail', 'test')
@@ -50,7 +50,7 @@ module Spassky
         test_result.summary.should == "1 test failed on 1 device"
       end
     end
-    
+
     context "when any test is still in progress" do
       it "is a fail" do
         TestResult.new([
@@ -60,7 +60,7 @@ module Spassky
         ]).status.should == "in progress"
       end
     end
-    
+
     context "when 1 test times out" do
       it "outputs the correct summary" do
         test_result = TestResult.new([
@@ -68,7 +68,7 @@ module Spassky
         ])
         test_result.summary.should == "1 test timed out on 1 device"
       end
-      
+
       it "has the status 'timed out'" do
         test_result = TestResult.new([
           Spassky::DeviceTestStatus.new('agent1', 'timed out', 'test'),
@@ -77,7 +77,7 @@ module Spassky
         test_result.status.should == "timed out"
       end
     end
-    
+
     it "can be serialized and deserialized" do
       test_result = TestResult.new([Spassky::DeviceTestStatus.new('agent', 'pass', 'test')])
       json = test_result.to_json
@@ -86,7 +86,7 @@ module Spassky
       deserialized.device_statuses.first.user_agent.should == 'agent'
       deserialized.device_statuses.first.status.should == 'pass'      
     end
-    
+
     describe "#completed_since(nil)" do
       it "returns all device test results that are not in progress" do
         status_1 = Spassky::DeviceTestStatus.new('agent', 'pass', 'test1')
@@ -96,7 +96,7 @@ module Spassky
         test_result.completed_since(nil).should == [status_1, status_3]
       end
     end
-    
+
     describe "#completed_since(other_test_result)" do
       it "returns all device test results that are no longer in progress" do
         status_a1 = Spassky::DeviceTestStatus.new('agent', 'pass', 'test1')
@@ -105,12 +105,12 @@ module Spassky
         status_b1 = Spassky::DeviceTestStatus.new('agent', 'pass', 'test1')
         status_b2 = Spassky::DeviceTestStatus.new('agent', 'fail', 'test2')
         status_b3 = Spassky::DeviceTestStatus.new('agent', 'timed out', 'test3')
-        
+
         test_result_before = TestResult.new([status_a1, status_a2, status_a3])
         test_result_after  = TestResult.new([status_b1, status_b2, status_b3])
-        
+
         test_result_after.completed_since(test_result_before).should == [status_b2, status_b3]
       end
-    end    
+    end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spassky
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,12 +11,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-18 00:00:00.000000000 +01:00
+date: 2011-08-24 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70262000987040 !ruby/object:Gem::Requirement
+  requirement: &70336540979360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70262000987040
+  version_requirements: *70336540979360
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70262000986620 !ruby/object:Gem::Requirement
+  requirement: &70336540978940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70262000986620
+  version_requirements: *70336540978940
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70262000986200 !ruby/object:Gem::Requirement
+  requirement: &70336540978520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70262000986200
+  version_requirements: *70336540978520
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &70262000985780 !ruby/object:Gem::Requirement
+  requirement: &70336540978100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70262000985780
+  version_requirements: *70336540978100
+- !ruby/object:Gem::Dependency
+  name: wurfl-lite
+  requirement: &70336540977680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70336540977680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70262000985360 !ruby/object:Gem::Requirement
+  requirement: &70336540977260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70262000985360
+  version_requirements: *70336540977260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70262000984940 !ruby/object:Gem::Requirement
+  requirement: &70336546051000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +90,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70262000984940
+  version_requirements: *70336546051000
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70262000984520 !ruby/object:Gem::Requirement
+  requirement: &70336546050580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +101,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70262000984520
+  version_requirements: *70336546050580
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70262000984100 !ruby/object:Gem::Requirement
+  requirement: &70336546050160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +112,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70262000984100
+  version_requirements: *70336546050160
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70262000983680 !ruby/object:Gem::Requirement
+  requirement: &70336546049740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70336546049740
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: &70336546049320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,7 +134,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70262000983680
+  version_requirements: *70336546049320
 description: ''
 email:
 - andrew.vos@gmail.com
@@ -132,8 +154,15 @@ files:
 - bin/spassky
 - bin/spassky-server
 - config.ru
+- examples/qunit-failing/main.js
+- examples/qunit-failing/qunit.js
+- examples/qunit-failing/suite.html
+- examples/qunit-passing/main.js
+- examples/qunit-passing/qunit.js
+- examples/qunit-passing/suite.html
 - features/connection.feature
 - features/device_timeout.feature
+- features/list_devices.feature
 - features/run_html_tests.feature
 - features/run_qunit_tests.feature
 - features/server.feature
@@ -143,6 +172,7 @@ files:
 - lib/spassky.rb
 - lib/spassky/client.rb
 - lib/spassky/client/cli.rb
+- lib/spassky/client/device_list_retriever.rb
 - lib/spassky/client/directory_reader.rb
 - lib/spassky/client/pusher.rb
 - lib/spassky/client/test_runner.rb
@@ -150,6 +180,7 @@ files:
 - lib/spassky/server.rb
 - lib/spassky/server/app.rb
 - 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
@@ -158,11 +189,13 @@ files:
 - lib/spassky/version.rb
 - spassky.gemspec
 - spec/spassky/client/cli_spec.rb
+- 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/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
@@ -196,6 +229,7 @@ summary: ''
 test_files:
 - features/connection.feature
 - features/device_timeout.feature
+- features/list_devices.feature
 - features/run_html_tests.feature
 - features/run_qunit_tests.feature
 - features/server.feature
@@ -203,11 +237,13 @@ test_files:
 - features/support/env.rb
 - features/support/fixtures/qunit.js
 - spec/spassky/client/cli_spec.rb
+- 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/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