tddium-preview 0.1.4 → 0.1.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tddium-preview (0.1.3)
+    tddium-preview (0.1.4)
       bundler
       highline
       json

data/lib/tddium.rb

@@ -22,11 +22,6 @@ require File.expand_path("../tddium/constant", __FILE__)
 #      tddium account  # View/Manage account information
 #      tddium account:password # Change password
 #
-#      tddium dev      # Enter "dev" mode, for single-test quick-turnaround debugging.
-#      tddium stopdev  # Leave "dev" mode.
-#
-#      tddium clean    # Clean up test results, especially large objects like videos
-#
 #      tddium help     # Print this usage message
 
 class Tddium < Thor
@@ -131,7 +126,7 @@ class Tddium < Thor
   method_option :test_pattern, :type => :string, :default => Default::TEST_PATTERN
   def spec
     set_default_environment(options[:environment])
-    return unless git_repo? && tddium_settings && suite_for_current_branch?
+    exit_failure unless git_repo? && tddium_settings && suite_for_current_branch?
 
     test_execution_params = {}
 
@@ -144,8 +139,7 @@ class Tddium < Thor
         test_execution_params[:user_data_text] = Base64.encode64(user_data)
         test_execution_params[:user_data_filename] = File.basename(user_data_file_path)
       else
-        say Text::Error::NO_USER_DATA_FILE % user_data_file_path
-        return
+        exit_failure Text::Error::NO_USER_DATA_FILE % user_data_file_path
       end
     end
 
@@ -170,14 +164,13 @@ class Tddium < Thor
       suite_details = call_api(:get, current_suite_path)
 
       # Push the latest code to git
-      return unless update_git_remote_and_push(suite_details)
+      exit_failure unless update_git_remote_and_push(suite_details)
 
       # Get a list of files to be tested
       test_files = Dir.glob(test_pattern).collect {|file_path| {:test_name => file_path}}
 
       if test_files.empty?
-        say Text::Error::NO_MATCHING_FILES % test_pattern
-        return
+        exit_failure Text::Error::NO_MATCHING_FILES % test_pattern
       end
 
       # Create a session
@@ -224,7 +217,11 @@ class Tddium < Thor
         end
 
         # If all tests finished, exit the loop else sleep
-        finished_tests.size == current_test_executions["tests"].size ? tests_not_finished_yet = false : sleep(Default::SLEEP_TIME_BETWEEN_POLLS)
+        if finished_tests.size == current_test_executions["tests"].size
+          tests_not_finished_yet = false
+        else
+          sleep(Default::SLEEP_TIME_BETWEEN_POLLS)
+        end
       end
 
       # Print out the result
@@ -236,6 +233,8 @@ class Tddium < Thor
       write_suite(current_suite_id, {"user_data_file" => user_data_file_path,
                                      "max_parallelism" => max_parallelism,
                                      "test_pattern" => test_pattern})
+
+      exit_failure if test_statuses["failed"] > 0 || test_statuses["errors"] > 0
     rescue TddiumClient::Error::Base
     end
   end
@@ -389,6 +388,10 @@ class Tddium < Thor
     tddium_client.environment.to_sym
   end
 
+  def exit_failure(msg='')
+    abort msg
+  end
+
   def get_user
     call_api(:get, Api::Path::USERS, {}, nil, false) rescue nil
   end

data/lib/tddium/version.rb

@@ -3,5 +3,5 @@ Copyright (c) 2011 Solano Labs All Rights Reserved
 =end
 
 module TddiumVersion
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/tddium_spec.rb

@@ -5,6 +5,8 @@ Copyright (c) 2011 Solano Labs All Rights Reserved
 
 require 'spec_helper'
 
+class EXIT_FAILURE_EXCEPTION < RuntimeError; end
+
 describe Tddium do
   include FakeFS::SpecHelpers
   include TddiumSpecHelpers
@@ -54,7 +56,8 @@ describe Tddium do
   end
 
   def run(tddium, options = {:test_pattern => DEFAULT_TEST_PATTERN, :environment => "test"})
-    send("run_#{example.example_group.ancestors.map(&:description)[-2][1..-1]}", tddium, options)
+    method = example.example_group.ancestors.map(&:description)[-2][1..-1]
+    send("run_#{method}", tddium, options)
   end
 
   [:suite, :spec, :status, :account, :login, :logout, :password].each do |method|
@@ -62,10 +65,14 @@ describe Tddium do
       options = params.first || {}
       if method == :spec 
         options[:test_pattern] = DEFAULT_TEST_PATTERN unless options.has_key?(:test_pattern)
+        stub_exit_failure
       end
       options[:environment] = "test" unless options.has_key?(:environment)
       stub_cli_options(tddium, options)
-      tddium.send(method)
+      begin
+        tddium.send(method)
+      rescue EXIT_FAILURE_EXCEPTION
+      end
     end
   end
 
@@ -143,6 +150,10 @@ describe Tddium do
     tddium.stub(:sleep).with(Tddium::Default::SLEEP_TIME_BETWEEN_POLLS)
   end
 
+  def stub_exit_failure
+    tddium.stub(:exit_failure).and_raise(EXIT_FAILURE_EXCEPTION)
+  end
+
   def stub_tddium_client
     TddiumClient::Client.stub(:new).and_return(tddium_client)
     tddium_client.stub(:environment).and_return("test")
@@ -646,17 +657,38 @@ describe Tddium do
       stub_config_file(:api_key => true, :branches => true)
     end
 
-    it_should_behave_like "set the default environment"
+    it_should_behave_like "set the default environment" do
+      let(:run_function) {spec_should_fail}
+    end
     it_should_behave_like "git repo has not been initialized"
     it_should_behave_like ".tddium file is missing or corrupt"
     it_should_behave_like "suite has not been initialized"
 
+    def spec_should_fail(options={})
+      options[:test_pattern] = DEFAULT_TEST_PATTERN unless options.has_key?(:test_pattern)
+      options[:environment] = "test" unless options.has_key?(:environment)
+      stub_cli_options(tddium, options)
+      tddium.stub(:exit_failure).and_raise(SystemExit)
+      yield if block_given?
+      expect { tddium.spec }.to raise_error(SystemExit)
+    end
+
+    def spec_should_pass(options={})
+      options[:test_pattern] = DEFAULT_TEST_PATTERN unless options.has_key?(:test_pattern)
+      options[:environment] = "test" unless options.has_key?(:environment)
+      stub_cli_options(tddium, options)
+      tddium.stub(:exit_failure).and_raise(SystemExit)
+      yield if block_given?
+      expect { tddium.spec }.not_to raise_error
+    end
+
     context "user-data-file" do
       context "does not exist" do
         context "from command line option" do
           it "should be picked first" do
-            tddium.should_receive(:say).with(Tddium::Text::Error::NO_USER_DATA_FILE % SAMPLE_FILE_PATH)
-            run_spec(tddium, :user_data_file => SAMPLE_FILE_PATH)
+            spec_should_fail(:user_data_file => SAMPLE_FILE_PATH) do
+              tddium.should_receive(:exit_failure).with(Tddium::Text::Error::NO_USER_DATA_FILE % SAMPLE_FILE_PATH)
+            end
           end
         end
 
@@ -664,19 +696,20 @@ describe Tddium do
           before { stub_config_file(:branches => {SAMPLE_BRANCH_NAME => {"id" => SAMPLE_SUITE_ID, "options" => {"user_data_file" => SAMPLE_FILE_PATH2}}}) }
 
           it "should be picked if no command line option" do
-            tddium.should_receive(:say).with(Tddium::Text::Error::NO_USER_DATA_FILE % SAMPLE_FILE_PATH2)
-            run_spec(tddium)
+            spec_should_fail do
+              tddium.should_receive(:exit_failure).with(Tddium::Text::Error::NO_USER_DATA_FILE % SAMPLE_FILE_PATH2)
+            end
           end
         end
 
         it "should not try to git push" do
           tddium.should_not_receive(:system).with(/^git push/)
-          run_spec(tddium, :user_data_file => SAMPLE_FILE_PATH)
+          spec_should_fail(:user_data_file => SAMPLE_FILE_PATH)
         end
 
         it "should not call the api" do
           tddium_client.should_not_receive(:call_api)
-          run_spec(tddium, :user_data_file => SAMPLE_FILE_PATH)
+          spec_should_fail(:user_data_file => SAMPLE_FILE_PATH)
         end
       end
     end
@@ -699,6 +732,7 @@ describe Tddium do
       context "git push was unsuccessful" do
         before { stub_git_push(tddium, false) }
         it "should not try to create a new session" do
+          tddium.should_receive(:exit_failure)
           tddium_client.should_not_receive(:call_api).with(:post, Tddium::Api::Path::SESSIONS)
           run_spec(tddium)
         end
@@ -856,7 +890,7 @@ describe Tddium do
               end
 
               it "should show the user a summary of all the tests" do
-                tddium.should_receive(:say).with("3 examples, 1 failures, 0 errors, 1 pending")
+                tddium.should_receive(:say).with("3 tests, 1 failures, 0 errors, 1 pending")
                 run_spec(tddium)
               end
 
@@ -864,48 +898,98 @@ describe Tddium do
             end
 
             context "'GET #{Tddium::Api::Path::TEST_EXECUTIONS}' is successful" do
-              before do
-                get_test_executions_response_all_finished = {"report"=>SAMPLE_REPORT_URL, "tests"=>{"spec/mouse_spec.rb"=>{"finished" => true, "status"=>"pending"}, "spec/pig_spec.rb"=>{"finished" => true, "status"=>"error"}, "spec/dog_spec.rb"=>{"finished" => true, "status"=>"failed"}, "spec/cat_spec.rb"=>{"finished" => true, "status"=>"passed"}}}
-                stub_call_api_response(:get, "#{Tddium::Api::Path::SESSIONS}/#{SAMPLE_SESSION_ID}/#{Tddium::Api::Path::TEST_EXECUTIONS}", get_test_executions_response, get_test_executions_response_all_finished)
-                stub_sleep(tddium)
-              end
+              context "with mixed results" do
+                before do
+                  get_test_executions_response_all_finished = {"report"=>SAMPLE_REPORT_URL, "tests"=>{"spec/mouse_spec.rb"=>{"finished" => true, "status"=>"pending"}, "spec/pig_spec.rb"=>{"finished" => true, "status"=>"error"}, "spec/dog_spec.rb"=>{"finished" => true, "status"=>"failed"}, "spec/cat_spec.rb"=>{"finished" => true, "status"=>"passed"}}}
+                  stub_call_api_response(:get, "#{Tddium::Api::Path::SESSIONS}/#{SAMPLE_SESSION_ID}/#{Tddium::Api::Path::TEST_EXECUTIONS}", get_test_executions_response, get_test_executions_response_all_finished)
+                  stub_sleep(tddium)
+                end
 
-              it "should sleep for #{Tddium::Default::SLEEP_TIME_BETWEEN_POLLS} seconds" do
-                tddium.should_receive(:sleep).exactly(1).times.with(Tddium::Default::SLEEP_TIME_BETWEEN_POLLS)
-                run_spec(tddium)
-              end
+                it "should sleep for #{Tddium::Default::SLEEP_TIME_BETWEEN_POLLS} seconds" do
+                  tddium.should_receive(:sleep).exactly(1).times.with(Tddium::Default::SLEEP_TIME_BETWEEN_POLLS)
+                  run_spec(tddium)
+                end
 
-              it "should display a green '.'" do
-                tddium.should_receive(:say).with(".", :green, false)
-                run_spec(tddium)
-              end
+                it "should display a green '.'" do
+                  tddium.should_receive(:say).with(".", :green, false)
+                  run_spec(tddium)
+                end
 
-              it "should display a red 'F'" do
-                tddium.should_receive(:say).with("F", :red, false)
-                run_spec(tddium)
-              end
+                it "should display a red 'F'" do
+                  tddium.should_receive(:say).with("F", :red, false)
+                  run_spec(tddium)
+                end
 
-              it "should display a yellow '*'" do
-                tddium.should_receive(:say).with("*", :yellow, false)
-                run_spec(tddium)
-              end
+                it "should display a yellow '*'" do
+                  tddium.should_receive(:say).with("*", :yellow, false)
+                  run_spec(tddium)
+                end
 
-              it "should display 'E' with no color" do
-                tddium.should_receive(:say).with("E", nil, false)
-                run_spec(tddium)
-              end
+                it "should display 'E' with no color" do
+                  tddium.should_receive(:say).with("E", nil, false)
+                  run_spec(tddium)
+                end
 
-              it "should display a summary of all the tests" do
-                tddium.should_receive(:say).with("4 examples, 1 failures, 1 errors, 1 pending")
-                run_spec(tddium)
-              end
+                it "should display a summary of all the tests" do
+                  tddium.should_receive(:say).with("4 tests, 1 failures, 1 errors, 1 pending")
+                  spec_should_fail do
+                    tddium.should_receive(:exit_failure).once
+                  end
+                end
 
-              it "should save the spec options" do
-                tddium.should_receive(:write_suite).with(SAMPLE_SUITE_ID, {"user_data_file" => nil, "max_parallelism" => 3, "test_pattern" => DEFAULT_TEST_PATTERN})
-                run_spec(tddium, {:max_parallelism => 3})
+                it "should save the spec options" do
+                  tddium.should_receive(:write_suite).with(SAMPLE_SUITE_ID, {"user_data_file" => nil, "max_parallelism" => 3, "test_pattern" => DEFAULT_TEST_PATTERN})
+                  run_spec(tddium, {:max_parallelism => 3})
+                end
+
+                it_should_behave_like("test output summary")
               end
+              context "with no errors" do
+                before do
+                  get_test_executions_response_all_passed = {
+                    "report"=>SAMPLE_REPORT_URL, 
+                    "tests"=>{"spec/mouse_spec.rb"=>{"finished" => true, "status"=>"passed"},
+                              "spec/pig_spec.rb"=>{"finished" => true, "status"=>"passed"},
+                              "spec/dog_spec.rb"=>{"finished" => true, "status"=>"passed"},
+                              "spec/cat_spec.rb"=>{"finished" => true, "status"=>"passed"}}}
+                  stub_call_api_response(:get, "#{Tddium::Api::Path::SESSIONS}/#{SAMPLE_SESSION_ID}/#{Tddium::Api::Path::TEST_EXECUTIONS}", get_test_executions_response_all_passed)
+                  stub_sleep(tddium)
+                end
 
-              it_should_behave_like("test output summary")
+                it "should display a green '.'" do
+                  tddium.should_receive(:say).with(".", :green, false)
+                  run_spec(tddium)
+                end
+
+                it "should not display a red 'F'" do
+                  tddium.should_not_receive(:say).with("F", :red, false)
+                  run_spec(tddium)
+                end
+
+                it "should not display a yellow '*'" do
+                  tddium.should_not_receive(:say).with("*", :yellow, false)
+                  run_spec(tddium)
+                end
+
+                it "should not display 'E' with no color" do
+                  tddium.should_not_receive(:say).with("E", nil, false)
+                  run_spec(tddium)
+                end
+
+                it "should display a summary of all the tests" do
+                  tddium.should_receive(:say).with("4 tests, 0 failures, 0 errors, 0 pending")
+                  spec_should_pass do
+                    tddium.should_not_receive(:exit_failure)
+                  end
+                end
+
+                it "should save the spec options" do
+                  tddium.should_receive(:write_suite).with(SAMPLE_SUITE_ID, {"user_data_file" => nil, "max_parallelism" => 3, "test_pattern" => DEFAULT_TEST_PATTERN})
+                  run_spec(tddium, {:max_parallelism => 3})
+                end
+
+                it_should_behave_like("test output summary")
+              end
             end
 
             it_should_behave_like "an unsuccessful api call"

metadata

@@ -2,7 +2,7 @@
 name: tddium-preview
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Solano Labs