spassky 0.1.35 → 0.1.36

data/README.md

@@ -28,22 +28,22 @@ Check what devices are connected to the server:
 spassky devices http://localhost:9191
 ```
 
-Run a test:
+Run a single html file (the second parameter is the test name):
 
 ```
-spassky run html_test.html http://localhost:9191
+spassky run html_test.html html_test.html http://localhost:9191
 ```
 
 Run a test with colour:
 
 ```
-spassky run html_test.html http://localhost:9191 --colour
+spassky run html_test.html html_test.html http://localhost:9191 --colour
 ```
 
-Run a directory that contains a test (the first .html file will be used as the test)
+Run a directory that contains a test
 
 ```
-spassky run test_directory http://localhost:9191
+spassky run test_directory html_test.html http://localhost:9191
 ```
 
 Why?

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 <host>" with the server host
+    And I run "spassky run timed-out.html timed-out.html <host>" with the server host
     Then the output should contain:
       """
       TIMED OUT timed-out.html on ipad

data/features/run_html_tests.feature

@@ -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 <host>" with the server host
+    When I run "spassky run passing.html passing.html <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 <host>" with the server host
+    When I run "spassky run passing.html 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)
@@ -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 <host>" with the server host
+    When I run "spassky run passing.html passing.html <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 <host>" with the server host
+    When I run "spassky run passing.html passing.html <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 <host>" with the server host
+    When I run "spassky run failing.html failing.html <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 <host>" with the server host
+    When I run "spassky run failing.html failing.html <host>" with the server host
     Then the output should contain:
       """
       FAIL failing.html on blackberry

data/features/run_qunit_tests.feature

@@ -20,7 +20,7 @@ Feature: Run QUnit Tests
       });
       """
     And a file named "qunit_passing/qunit_test/qunit.js" with qunit.js in it
-    And a file named "qunit_passing/qunit_test/suite.html" with:
+    And a file named "qunit_passing/qunit_test/test_suite.html" with:
       """
       <html>
         <head></head>
@@ -32,10 +32,10 @@ Feature: Run QUnit Tests
       </html>
       """
     And a connected mobile device "blackberry"
-    When I run "spassky run qunit_passing/qunit_test <host>" with the server host
+    When I run "spassky run qunit_passing/qunit_test test_suite.html <host>" with the server host
     Then the output should contain:
       """
-      PASS qunit_test on blackberry
+      PASS test_suite.html on blackberry
       """
     And the exit status should be 0
 
@@ -55,7 +55,7 @@ Feature: Run QUnit Tests
       });
       """
     And a file named "qunit_failing/qunit_test/qunit.js" with qunit.js in it
-    And a file named "qunit_failing/qunit_test/suite.html" with:
+    And a file named "qunit_failing/qunit_test/test_suite.html" with:
       """
       <html>
         <head></head>
@@ -67,10 +67,10 @@ Feature: Run QUnit Tests
       </html>
       """
     And a connected mobile device "blackberry"
-    When I run "spassky run qunit_failing/qunit_test <host>" with the server host
+    When I run "spassky run qunit_failing/qunit_test test_suite.html <host>" with the server host
     Then the output should contain:
       """
-      FAIL qunit_test on blackberry
+      FAIL test_suite.html on blackberry
       """
     And the exit status should be 1
 
@@ -90,7 +90,7 @@ Feature: Run QUnit Tests
       });
       """
     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:
+    And a file named "qunit_passing/qunit_test/test_suite.html" with:
       """
       <html>
         <head></head>
@@ -102,9 +102,9 @@ Feature: Run QUnit Tests
       </html>
       """
     And a connected mobile device "blackberry"
-    When I run "spassky run qunit_passing/qunit_test <host>" with the server host
+    When I run "spassky run qunit_passing/qunit_test test_suite.html <host>" with the server host
     Then the output should contain:
       """
-      PASS qunit_test on blackberry
+      PASS test_suite.html on blackberry
       """
     And the exit status should be 0

data/features/summary.feature

@@ -29,9 +29,5 @@ Feature: Summary
 
   Scenario: One test passing on all devices
     Given I have two connected devices
-    When I run "spassky run passing.html <host>" with the server host
+    When I run "spassky run passing.html passing.html <host>" with the server host
     Then the output should contain "2 passed"
-
-    #2 passed
-    #2 passed, 1 failed
-    #3 passed, 1 failed, 1 timed out

data/lib/spassky/client/cli.rb

@@ -15,11 +15,11 @@ module Spassky::Client
     DEFAULT_SERVER = "http://localhost:#{DEFAULT_PORT}"
 
     command "run a test"
-    def run(test, server = DEFAULT_SERVER, colour = false)
+    def run(pattern, 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))
-      test_runner.run_tests(test)
+      test_runner = TestRunner.new(pusher, writer.new(STDOUT), DirectoryReader.new(pattern))
+      test_runner.run_tests(pattern, test)
     end
 
     command "list devices"

data/lib/spassky/client/test_runner.rb

@@ -8,8 +8,7 @@ module Spassky::Client
       @directory_reader = directory_reader
     end
 
-    def run_tests(pattern)
-      test_name = File.basename(pattern)
+    def run_tests(pattern, test_name)
       begin
         @pusher.push(:name => test_name, :contents => @directory_reader.read_files.to_json) do |result|
           handle_test_result(result)

data/lib/spassky/server/html_test.rb

@@ -8,19 +8,11 @@ module Spassky::Server
 
     def get_file(name)
       file_contents = @contents[name]
-      if file_contents.nil?
-        file_contents = get_test_file_contents
-      end
       add_helpers_to_html file_contents
     end
 
     private
 
-    def get_test_file_contents
-      html_file = @contents.keys.find {|key| key.end_with?(".html")}
-      file_contents = @contents[html_file]
-    end
-
     def add_helpers_to_html html
       html.gsub('</head>', assert_js_script + meta_refresh_tag + '</head>')
     end

data/lib/spassky/version.rb

@@ -1,3 +1,3 @@
 module Spassky
-  VERSION = '0.1.35'
+  VERSION = '0.1.36'
 end

data/spec/spassky/client/cli_spec.rb

@@ -17,15 +17,17 @@ module Spassky::Client
     end
 
     describe "spassky run" do
-      it "creates a pusher with the server url as the first argument" do
-        Pusher.should_receive(:new).with("server_name").and_return(pusher)
-        TestRunner.should_receive(:new).with(pusher, anything(), anything()).and_return(runner)
-        Cli.new.run "test_name", "server_name"
+      context "with a server url" do
+        it "creates a pusher" do
+          Pusher.should_receive(:new).with("server_name").and_return(pusher)
+          TestRunner.should_receive(:new).with(pusher, anything(), anything()).and_return(runner)
+          Cli.new.run "test_pattern", "test_name", "server_name"
+        end
       end
 
-      it "runs a single test with the name as the second argument" do
-        runner.should_receive(:run_tests).with("test_name")
-        Cli.new.run "test_name", "server_name"
+      it "runs a test" do
+        runner.should_receive(:run_tests).with("test_pattern", "test_name")
+        Cli.new.run "test_pattern", "test_name", "server_name"
       end
 
       context "without colour output option" do
@@ -33,7 +35,7 @@ module Spassky::Client
           default_writer = mock :default_writer
           DefaultWriter.should_receive(:new).with(STDOUT).and_return(default_writer)
           TestRunner.should_receive(:new).with(anything(), default_writer, anything())
-          Cli.new.run "test_name", "server_name"
+          Cli.new.run "test_pattern", "test_name", "server_name"
         end
       end
 
@@ -42,7 +44,7 @@ module Spassky::Client
           coloured_writer = mock :coloured_writer
           ColouredWriter.should_receive(:new).with(STDOUT).and_return(coloured_writer)
           TestRunner.should_receive(:new).with(anything(), coloured_writer, anything())
-          Cli.new.run "test_name", "server_name", "--colour"
+          Cli.new.run "test_pattern", "test_name", "server_name", "--colour"
         end
       end
     end

data/spec/spassky/client/test_runner_spec.rb

@@ -41,19 +41,19 @@ module Spassky::Client
     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_runner.run_tests("foo_test", "test name")
     end
 
-    it "gets the test name from the base name of the pattern and pushes the test" do
+    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/foo_test")
+      @test_runner.run_tests("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)
         Kernel.should_receive(:exit).with(2)
-        @test_runner.run_tests("foo_test")
+        @test_runner.run_tests("foo_test", "test name")
       end
     end
 
@@ -64,12 +64,12 @@ module Spassky::Client
 
       it "only writes once" do
         @writer.should_receive(:write_failing).once
-        @test_runner.run_tests("foo_test")
+        @test_runner.run_tests("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_runner.run_tests("foo_test", "test name")
       end
     end
 
@@ -77,7 +77,7 @@ module Spassky::Client
       it "writes passing output" do
         @test_pusher.stub!(:push).and_yield(new_passed_test_result)
         @writer.should_receive(:write_passing).with("pass summary")
-        @test_runner.run_tests("foo_test")
+        @test_runner.run_tests("foo_test", "test name")
       end
     end
 
@@ -88,12 +88,12 @@ module Spassky::Client
 
       it "writes out the error" do
         @writer.should_receive(:write_failing).with("hell")
-        @test_runner.run_tests("foo_test")
+        @test_runner.run_tests("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_runner.run_tests("foo_test", "test name")
       end
     end
 
@@ -103,7 +103,7 @@ module Spassky::Client
         @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")
+        TestRunner.new(@test_pusher, @writer, @directory_reader).run_tests("foo_test", "test name")
       end
     end
 
@@ -113,7 +113,7 @@ module Spassky::Client
         pass_test_result        = new_passed_test_result
         @test_pusher.stub!(:push).and_yield(in_progress_test_result).and_yield(pass_test_result)
         @writer.should_receive(:write_passing).with("pass summary").once
-        @test_runner.run_tests("foo_test")
+        @test_runner.run_tests("foo_test", "test name")
       end
     end
 
@@ -131,7 +131,7 @@ module Spassky::Client
         @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_runner.run_tests("foo bar", "test name")
       end
     end
 
@@ -147,7 +147,7 @@ module Spassky::Client
 
         @writer.should_receive(:write_failing).with("test result message").once
 
-        @test_runner.run_tests("foo bar")
+        @test_runner.run_tests("foo bar", "test name")
       end
     end
   end

data/spec/spassky/server/app_spec.rb

@@ -111,15 +111,6 @@ module Spassky::Server
         end
       end
 
-      context "file name is not a file" do
-        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)
-          get "/test_runs/123/run/random/not_a_file"
-          last_response.body.should include("actual test!")
-        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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spassky
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 0.1.36
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ date: 2011-09-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70126581990920 !ruby/object:Gem::Requirement
+  requirement: &70322539873180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70126581990920
+  version_requirements: *70322539873180
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70126581989580 !ruby/object:Gem::Requirement
+  requirement: &70322539872120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70126581989580
+  version_requirements: *70322539872120
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70126581988300 !ruby/object:Gem::Requirement
+  requirement: &70322539870440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70126581988300
+  version_requirements: *70322539870440
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &70126581986260 !ruby/object:Gem::Requirement
+  requirement: &70322539868280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70126581986260
+  version_requirements: *70322539868280
 - !ruby/object:Gem::Dependency
   name: wurfl-lite
-  requirement: &70126581984940 !ruby/object:Gem::Requirement
+  requirement: &70322539867280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70126581984940
+  version_requirements: *70322539867280
 - !ruby/object:Gem::Dependency
   name: commandable
-  requirement: &70126581983900 !ruby/object:Gem::Requirement
+  requirement: &70322539866380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70126581983900
+  version_requirements: *70322539866380
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70126581982900 !ruby/object:Gem::Requirement
+  requirement: &70322539865040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126581982900
+  version_requirements: *70322539865040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70126581981960 !ruby/object:Gem::Requirement
+  requirement: &70322539863940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126581981960
+  version_requirements: *70322539863940
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70126581980780 !ruby/object:Gem::Requirement
+  requirement: &70322539863140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126581980780
+  version_requirements: *70322539863140
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70126581979720 !ruby/object:Gem::Requirement
+  requirement: &70322539861800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +122,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126581979720
+  version_requirements: *70322539861800
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70126581978220 !ruby/object:Gem::Requirement
+  requirement: &70322539860960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +133,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126581978220
+  version_requirements: *70322539860960
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70126581977420 !ruby/object:Gem::Requirement
+  requirement: &70322539859900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,10 +144,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126581977420
+  version_requirements: *70322539859900
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70126581976620 !ruby/object:Gem::Requirement
+  requirement: &70322539858760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -155,10 +155,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126581976620
+  version_requirements: *70322539858760
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70126581975680 !ruby/object:Gem::Requirement
+  requirement: &70322539857760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,7 +166,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126581975680
+  version_requirements: *70322539857760
 description: ''
 email:
 - andrew.vos@gmail.com