aslakhellesoy-cucumber 0.1.99.9 → 0.1.99.10

data/History.txt

@@ -57,6 +57,7 @@ Scenario Outlines, the rich command line, the nice output format and everything
 pure Ruby users have been enjoying for a while.
 
 == Bugfixes
+* Errors with rspec-rails matchers in cucumber 0.1.99 (#173 David Chelimsky)
 * Can't use an empty string as a table value in a scenario outline (#172 Aslak Hellesøy)
 * Really skip skipped steps (#90 Aslak Hellesøy)
 * No output for multi-line strings (#71 Aslak Hellesøy)

data/Manifest.txt

@@ -127,7 +127,7 @@ examples/test_unit/features/step_definitions/test_unit_steps.rb
 examples/test_unit/features/test_unit.feature
 examples/tickets/Rakefile
 examples/tickets/cucumber.yml
-examples/tickets/features/77.feature
+examples/tickets/features/172.feature
 examples/tickets/features/lib/eatting_machine.rb
 examples/tickets/features/lib/pantry.rb
 examples/tickets/features/scenario_outline.feature

data/examples/tickets/features/172.feature

@@ -0,0 +1,28 @@
+Feature: Login
+  To ensure the safety of the application
+  A regular user of the system
+  Must authenticate before using the app
+
+
+  Scenario Outline: Failed Login
+    Given the user "known_user"
+
+    When I go to the main page
+    Then I should see the login form
+
+    When I fill in "login" with "<login>"
+    And I fill in "password" with "<password>"
+    And I press "Log In"
+    Then the login request should fail
+    And I should see the error message "Login or Password incorrect"
+
+    Examples:
+      | login        | password       |
+      |              |                |
+      | unknown_user |                |
+      | known_user   |                |
+      |              | wrong_password |
+      |              | known_userpass |
+      | unknown_user | wrong_password |
+      | unknown_user | known_userpass |
+      | known_user   | wrong_password |

data/lib/cucumber/ast/outline_table.rb

@@ -8,7 +8,7 @@ module Cucumber
       end
 
       def accept(visitor, status)
-        rows.each_with_index do |row, n|
+        cells_rows.each_with_index do |row, n|
           should_visit = n == 0 || 
             row.at_lines?(visitor.current_feature_lines) ||
             @scenario_outline.at_header_or_step_lines?(visitor.current_feature_lines)

data/lib/cucumber/ast/table.rb

@@ -19,11 +19,11 @@ module Cucumber
       end
 
       def at_lines?(lines)
-        rows.detect { |row| row.at_lines?(lines) }
+        cells_rows.detect { |row| row.at_lines?(lines) }
       end
 
       def accept(visitor, status)
-        rows.each do |row|
+        cells_rows.each do |row|
           visitor.visit_table_row(row, status)
         end
         nil
@@ -42,7 +42,7 @@ module Cucumber
       #   [{'a' => '2', 'b' => '3', 'sum' => '5'}, {'a' => '7', 'b' => '9', 'sum' => '16'}]
       #
       def hashes
-        @hashes ||= rows[1..-1].map do |row|
+        @hashes ||= cells_rows[1..-1].map do |row|
           row.to_hash
         end
       end
@@ -68,7 +68,7 @@ module Cucumber
 
       # For testing only
       def to_sexp #:nodoc:
-        [:table, *rows.map{|row| row.to_sexp}]
+        [:table, *cells_rows.map{|row| row.to_sexp}]
       end
 
       def to_hash(cells) #:nodoc:
@@ -80,7 +80,7 @@ module Cucumber
       end
 
       def index(cells) #:nodoc:
-        rows.index(cells)
+        cells_rows.index(cells)
       end
 
       def arguments_replaced(arguments) #:nodoc:
@@ -98,7 +98,7 @@ module Cucumber
       end
 
       def at_lines?(lines)
-        rows.detect{|row| row.at_lines?(lines)}
+        cells_rows.detect{|row| row.at_lines?(lines)}
       end
 
       private
@@ -107,7 +107,7 @@ module Cucumber
         columns[col].__send__(:width)
       end
 
-      def rows
+      def cells_rows
         @rows ||= cell_matrix.map do |cell_row|
           @cells_class.new(self, cell_row)
         end

data/lib/cucumber/rails/rspec.rb

@@ -1,5 +1,8 @@
+require 'cucumber/rails/world'
 require 'spec/expectations'
 require 'spec/rails/matchers'
 
-ActionController::Integration::Session.send(:include, Spec::Matchers)
-ActionController::Integration::Session.send(:include, Spec::Rails::Matchers)
+Cucumber::Rails::World.class_eval do
+  include Spec::Matchers
+  include Spec::Rails::Matchers
+end

data/lib/cucumber/version.rb

@@ -3,7 +3,7 @@ module Cucumber #:nodoc:
     MAJOR = 0
     MINOR = 1
     TINY  = 99
-    PATCH = 9 # Set to nil for official release
+    PATCH = 10 # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
   end

data/spec/cucumber/ast/table_spec.rb

@@ -12,12 +12,12 @@ module Cucumber
         @table.extend(Module.new{
           attr_reader :raw
         })
-        def @table.rows; super; end
+        def @table.cells_rows; super; end
         def @table.columns; super; end
       end
 
       it "should have rows" do
-        @table.rows[0].map{|cell| cell.value}.should == %w{1 22 333}
+        @table.cells_rows[0].map{|cell| cell.value}.should == %w{1 22 333}
       end
 
       it "should have columns" do
@@ -26,7 +26,7 @@ module Cucumber
 
       it "should have same cell objects in rows and columns" do
         # 666666
-        @table.rows[1].__send__(:[], 2).should equal(@table.columns[2].__send__(:[], 1))
+        @table.cells_rows[1].__send__(:[], 2).should equal(@table.columns[2].__send__(:[], 1))
       end
 
       it "should know about max width of a row" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.1.99.9
+  version: 0.1.99.10
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -192,6 +192,7 @@ files:
 - examples/test_unit/features/test_unit.feature
 - examples/tickets/Rakefile
 - examples/tickets/cucumber.yml
+- examples/tickets/features/172.feature
 - examples/tickets/features/lib/eatting_machine.rb
 - examples/tickets/features/lib/pantry.rb
 - examples/tickets/features/scenario_outline.feature