spreewald 0.8.3 → 0.8.4

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - "1.8.7"
   - "1.9.3"
   - ree
+  - "2.0.0"
 script: rake travis:run
 notifications:
   email:

data/Rakefile

@@ -4,10 +4,14 @@ require "bundler/gem_tasks"
 desc 'Default: Run all tests.'
 task :default => 'all:features'
 
-
 desc 'Update the "Steps" section of the README'
 task :update_readme do
-  require 'support/documentation_generator'
+  if Kernel.respond_to? :require_relative
+    require_relative './support/documentation_generator'
+  else
+    require 'support/documentation_generator'
+  end
+
   readme = File.read('README.md')
   start_of_steps_section = readme =~ /^## Steps/
   length_of_steps_section = (readme[(start_of_steps_section+1)..-1] =~ /^##[^#]/) || readme.size - start_of_steps_section
@@ -16,13 +20,13 @@ task :update_readme do
 end
 
 namespace :travis do
-  
+
   desc 'Run tests in Travis CI'
   task :run => [:slimgems, 'all:bundle', 'all:features']
-  
+
   desc 'Install slimgems'
   task :slimgems do
-    system('gem install slimgems')
+    sh 'gem install slimgems' unless modern_ruby?
   end
 end
 
@@ -50,13 +54,17 @@ namespace :all do
   end
 end
 
+def modern_ruby?
+  Gem::Version.new(RUBY_VERSION) > Gem::Version.new('1.8.7')
+end
+
 def for_each_directory_of(path, &block)
   Dir[path].sort.each do |rakefile|
     directory = File.dirname(rakefile)
     puts '', "\033[44m#{directory}\033[0m", ''
 
-    if RUBY_VERSION.start_with?("1.9") and directory.include?("rails-2.3")
-      puts 'Skipping Rails 2.3 with Ruby 1.9.'
+    if modern_ruby? and directory.include?("rails-2.3")
+      puts "Rails 2.3 Tests are skipped for Rubies younger than versions 1.8.7"
     else
       block.call(directory)
     end

data/lib/spreewald/development_steps.rb

@@ -5,9 +5,14 @@ Then /^it should work$/ do
   pending
 end
 
-# Starts debugger
+# Starts debugger, or Pry if installed
 Then /^debugger$/ do
-  debugger
+  if binding.respond_to? :pry
+    binding.pry
+  else
+    debugger
+  end
+
   true # Ruby will halt in this line
 end
 

data/lib/spreewald_support/custom_matchers.rb

@@ -3,7 +3,7 @@ module CustomMatchers
 
   rspec::Matchers.define :contain_with_wildcards do |expected_string|
     match do |field_value|
-      @field_value = field_value
+      @field_value = field_value.to_s
       @expected_string = expected_string
       regex_parts = expected_string.split('*', -1).collect { |part| Regexp.escape(part) }
 
@@ -11,11 +11,11 @@ module CustomMatchers
     end
 
     failure_message_for_should do
-      "The field's content #@field_value did not match #@expected_string"
+      "The field's content #{@field_value.inspect} did not match #{@expected_string.inspect}"
     end
 
     failure_message_for_should_not do
-      "The field's content #@field_value matches #@expected_string"
+      "The field's content #{@field_value.inspect} matches #{@expected_string.inspect}"
     end
   end
   

data/lib/spreewald_support/version.rb

@@ -1,3 +1,3 @@
 module Spreewald
-  VERSION = '0.8.3'
+  VERSION = '0.8.4'
 end

data/tests/rails-2.3/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    spreewald (0.8.3)
+    spreewald (0.8.4)
       capybara
       cucumber
       cucumber-rails

data/tests/rails-3.2/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    spreewald (0.8.3)
+    spreewald (0.8.4)
       capybara
       cucumber
       cucumber-rails

data/tests/shared/app/views/forms/form1.html.haml

@@ -12,3 +12,6 @@
   = label_tag 'textarea_control', 'Textarea control'
   = text_area_tag 'textarea_control', 'Textarea control value'
 
+  = label_tag 'empty_control', 'Empty control'
+  = text_field_tag 'empty_control'
+

data/tests/shared/features/shared/web_steps.feature

@@ -8,6 +8,7 @@ Feature: Web steps
     Then the "Select control" field should contain "Label 2"
     Then the "Select control without selection" field should contain "Label 1"
     Then the "Textarea control" field should contain "Textarea control value"
+    Then the "Empty control" field should contain ""
 
   Scenario: /^I should see a form with the following values:$/
     Then I should see a form with the following values:
@@ -15,6 +16,7 @@ Feature: Web steps
       | Select control                   | Label 2                |
       | Select control without selection | Label 1                |
       | Textarea control                 | Textarea control value |
+      | Empty control                    |                        |
 
   Scenario: /^"([^"]*)" should be selected for "([^"]*)"$/
     Then "Label 2" should be selected for "Select control"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spreewald
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 8
-  - 3
-  version: 0.8.3
+  - 4
+  version: 0.8.4
 platform: ruby
 authors: 
 - Tobias Kraze
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-12-09 00:00:00 +01:00
+date: 2013-12-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,7 +71,6 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
-- .ruby-version
 - .travis.yml
 - LICENSE
 - README.md

data/.ruby-version

@@ -1 +0,0 @@
-1.8.7