aruba-jbb 0.2.6.12 → 0.2.6.13

data/History.txt

@@ -1,3 +1,12 @@
+== 0.2.6.13 jbb
+* added new api methods
+* refactored matchers for new api methods
+* added additional tests for stderr and stdout matchers
+
+== Bug fixes
+* fixed rspec syntax (no #should != instead must use #should_not ==)
+* fixed some documentation errors and omissions
+
 == 0.2.6.12 jbb
 * merged aslak 0.2.4
 * added remove_env to api

data/aruba-jbb.gemspec

@@ -2,9 +2,9 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aruba-jbb}
-  s.version = "0.2.6.12"
+  s.version = "0.2.6.13"
   s.authors = ["Aslak Hellesøy", "David Chelimsky", "James B. Byrne", "Mike Sassak"]
-  s.date = %q{2010-11-04}
+  s.date = %q{2010-11-09}
   s.description = %q{Fork of Aruba, Cucumber steps for testing CLI applications.}
   s.email = %q{cukes@googlegroups.com}
   s.homepage = %q{http://github.com/byrnejb/aruba}

data/features/output.feature

@@ -76,6 +76,16 @@ Feature: Output
       """
       hello
       """
+  
+  @announce
+  Scenario: Match passing exit status and exact output
+    When I run "ruby -e 'puts \"hello\\nworld\"'"
+    Then it should pass with exactly:
+      """
+      hello
+      world
+
+      """
 
   @announce-stdout
   Scenario: Match failing exit status and partial output

data/features/std_out.feature

@@ -15,3 +15,21 @@ Feature: run command should not limit size of STDOUT
     Then the stdout should contain "bbbbb"
     When I run "ruby -e 'puts :c.to_s * 65537'"
     Then the stdout should contain "ccccc"
+
+  @announce
+  Scenario: Check empty output
+    When I run "ruby -e 'r = 1 + 3'"
+    Then stdout should be empty
+      And stderr should be empty
+
+  @announce
+  Scenario: Check not empty output
+    When I run "ruby -e 'puts( %Q*Hello World!* )'"
+    Then stdout should not be empty
+      And stderr should be empty
+
+  @announce
+  Scenario: Check not empty error
+    When I run "ruby -e 'fail'"
+    Then stdout should be empty
+      And stderr should not be empty

data/lib/aruba/api.rb

@@ -81,11 +81,44 @@ module Aruba
       end
     end
 
-    # assert_exit_status_and_partial_output is an internal helper
-    # method that really should not be used in a step definition.
+    # assert_exact_output compares the contents of the combined output
+    # for an exact match to the argument.  See assert_partial_output.
+    # #
+    def assert_exact_output(exact_output)
+      combined_output.should == exact_output
+    end
+
+    # assert_exit_status_and_output checks the contents of the combined output
+    # (exact) and also checks the exit status against the expected (zero or
+    # non-zero)
+    #
+    # Usage:
+    #   Then /should (pass|fail) with exactly:$/ do |pass_fail, exact_output|
+    #     assert_exit_status_and_output(pass_fail == "pass", exact_output, true)
+    #
+    def assert_exit_status_and_output(expect_to_pass, output, expect_exact_output)
+      if expect_exact_output
+        assert_exact_output(output)
+      else
+        assert_partial_output(output)
+      end
+      assert_exiting_with(expect_to_pass)
+    end
+    
+
+    # assert_exit_status_and_partial_output checks the contents of the combined
+    # output (partial) and also checks the exit status against the expected
+    # (zero or non-zero)
     #
     def assert_exit_status_and_partial_output(expect_to_pass, partial_output)
       assert_partial_output(partial_output)
+      assert_exiting_with(expect_to_pass)
+    end
+
+    # assert_exiting_with checks the exit status and fails if
+    # the expected condition is not met.
+    #
+    def assert_exiting_with(expect_to_pass)
       if expect_to_pass
         @last_exit_status.should == 0
       else

data/lib/aruba/cucumber_steps.rb

@@ -309,7 +309,12 @@ end
 
 
 When /should (pass|fail) with:$/ do |pass_fail, partial_output|
-  self.__send__("assert_#{pass_fail}ing_with", partial_output)
+  assert_exit_status_and_output(pass_fail == "pass", partial_output, false)
+end
+
+
+Then /should (pass|fail) with exactly:$/ do |pass_fail, exact_output|
+  assert_exit_status_and_output(pass_fail == "pass", exact_output, true)
 end
 
 
@@ -334,12 +339,12 @@ end
 
 
 When /stderr should not be empty$/ do
-  @last_stderr.should != ""
+  @last_stderr.should_not == ""
 end
 
 
 When /stdout should not be empty$/ do
-  @last_stdout.should != ""
+  @last_stdout.should_not == ""
 end
 
 
@@ -353,6 +358,16 @@ When /stdout should contain "([^\"]*)"$/ do |partial_output|
 end
 
 
+Then /stderr should contain exactly:$/ do |exact_output|
+  @last_stderr.should == exact_output
+end
+
+
+Then /stdout should contain exactly:$/ do |exact_output|
+  @last_stdout.should == exact_output
+end
+
+
 When /stderr should not contain "([^\"]*)"$/ do |partial_output|
   @last_stderr.should_not =~ regexp(partial_output)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: aruba-jbb
 version: !ruby/object:Gem::Version 
-  hash: 95
+  hash: 93
   prerelease: false
   segments: 
   - 0
   - 2
   - 6
-  - 12
-  version: 0.2.6.12
+  - 13
+  version: 0.2.6.13
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-04 00:00:00 -04:00
+date: 2010-11-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency