spreewald 0.9.5 → 0.9.6

data/Rakefile

@@ -2,7 +2,7 @@
 require "bundler/gem_tasks"
 
 desc 'Default: Run all tests.'
-task :default => 'all:features'
+task :default => 'all:rubies'
 
 desc 'Update the "Steps" section of the README'
 task :update_readme do
@@ -35,18 +35,17 @@ namespace :all do
   
   desc 'Run tests on several Ruby versions'
   task :rubies do
-    rubies = %w[1.8.7 1.9.3 2.0.0]
-    success = true
-
-    if system('rvm -v 2>&1 > /dev/null') # rvm installed
-      rubies.each do |ruby|
-        announce 'Running features for Ruby ' + ruby, 2
-        success &= system "rvm #{ruby} do rake all:bundle all:features"
-      end
+    success = case
+    when system('which rvm')
+      run_for_all_rubies :rvm
+    when system('which rbenv') && `rbenv commands`.split("\n").include?('alias')
+      # rbenv currently works only with the alias plugin, as we do not want to
+      # specify Ruby versions down to their patch levels.
+      run_for_all_rubies :rbenv
     else
-      fail 'Currently only rvm is supported. Open Rakefile and add your Ruby version manager!'
+      fail 'Currently only RVM and rbenv (with alias plugin) are supported. Open Rakefile and add your Ruby version manager!'
     end
-    
+
     fail "Tests failed" unless success
   end
 
@@ -61,6 +60,32 @@ namespace :all do
 
 end
 
+def run_for_all_rubies(version_manager)
+  %w[
+    1.8.7
+    1.9.3
+    2.0.0
+  ].all? do |ruby_version|
+    announce "Running features for Ruby #{ruby_version}", 2
+
+    execute = case version_manager
+    when :rvm
+      "rvm #{ruby_version} do"
+    when :rbenv
+      ENV['RBENV_VERSION'] = ruby_version
+      'rbenv exec'
+    end
+
+    current_version = `#{execute} ruby -v`.match(/^ruby (\d\.\d\.\d)/)[1]
+    if current_version == ruby_version
+      puts "Currently active Ruby is #{current_version}"
+      system "#{execute} rake all:bundle all:features"
+    else
+      fail "Failed to set Ruby #{ruby_version} (#{current_version} active!)"
+    end
+  end
+end
+
 def for_each_directory_of(path, &block)
   Dir[path].sort.each do |rakefile|
     directory = File.dirname(rakefile)

data/lib/spreewald/web_steps.rb

@@ -619,7 +619,10 @@ end
 # More details [here](https://makandracards.com/makandra/12139-waiting-for-page-loads-and-ajax-requests-to-finish-with-capybara).
 When /^I wait for the page to load$/ do
   if [:selenium, :webkit, :poltergeist].include?(Capybara.current_driver)
-    wait_until { page.evaluate_script("typeof jQuery === 'undefined' || $.active == 0") } # immediately return when no jQuery is loaded
+    patiently do
+      # when no jQuery is loaded, we assume there are no pending AJAX requests
+      page.evaluate_script("typeof jQuery === 'undefined' || $.active == 0").should be_true
+    end
   end
   page.has_content? ''
 end

data/lib/spreewald_support/version.rb

@@ -1,3 +1,3 @@
 module Spreewald
-  VERSION = '0.9.5'
+  VERSION = '0.9.6'
 end

data/tests/rails-2.3/Gemfile.lock

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

data/tests/rails-3.2/capybara-1/Gemfile.lock

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

data/tests/rails-3.2/capybara-2/Gemfile.lock

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

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

@@ -45,12 +45,3 @@ Feature: Web steps
     
     When I go back
     Then I should be on "/static_pages/link_to_home"
-
-
-  @javascript
-  Scenario: /^I go back$/
-    Given I go to "/static_pages/link_to_home"
-      And I follow "Home"
-    
-    When I go back
-    Then I should be on "/static_pages/link_to_home"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spreewald
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Tobias Kraze
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-03-21 00:00:00 +01:00
-default_executable: 
+date: 2014-04-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cucumber-rails
@@ -150,7 +149,6 @@ files:
 - tests/shared/features/shared/table_steps.feature
 - tests/shared/features/shared/web_steps.feature
 - tests/shared/features/support/paths.rb
-has_rdoc: true
 homepage: https://github.com/makandra/spreewald
 licenses: 
 - MIT
@@ -180,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.9.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Collection of useful cucumber steps.
@@ -242,3 +240,4 @@ test_files:
 - tests/shared/features/shared/table_steps.feature
 - tests/shared/features/shared/web_steps.feature
 - tests/shared/features/support/paths.rb
+has_rdoc: