Merge pull request #497 from cucumber/fix/final-osx-build-failures

Fix final OSX build failures
cucumber · Sep 16, 2017 · 7aa51fc · 7aa51fc
2 parents 287376a + 89eaa56
commit 7aa51fc
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -47,6 +47,10 @@ matrix:
     - rvm: ruby-head
     - rvm: jruby
     - rvm: jruby-9.1.13.0
+    - rvm: 1.9.3
+      os: osx
+    - rvm: 2.0.0
+      os: osx
   fast_finish: true
 branches:
   only:

diff --git a/bin/console b/bin/console
@@ -2,15 +2,6 @@
 
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
-require 'pry'
+require 'aruba/console'
 
-require 'aruba/api'
-
-module Aruba
-  class MyConsole
-    include Aruba::Api
-  end
-end
-
-include Aruba
-Pry.start MyConsole.new
+Aruba::Console.new.start
diff --git a/features/02_configure_aruba/home_directory.feature b/features/02_configure_aruba/home_directory.feature
@@ -20,9 +20,9 @@ Feature: Configure the home directory to be used with aruba
     end
     """
     When I successfully run `cucumber`
-    Then the output should contain:
+    Then the output should match:
     """
-    The default value is "/home/
+    The default value is "/.*/tmp/aruba"
     """
 
   Scenario: Set to current working directory
@@ -56,9 +56,9 @@ Feature: Configure the home directory to be used with aruba
     end
     """
     Then I successfully run `cucumber`
-    Then the output should contain:
+    Then the output should match:
     """
-    The default value is "/home/
+    The default value is "/.*/tmp/aruba"
     """
 
   Scenario: Set to some other path (deprecated)

diff --git a/features/03_testing_frameworks/cucumber/steps/command/debug_your_command_in_aruba.feature b/features/03_testing_frameworks/cucumber/steps/command/debug_your_command_in_aruba.feature
@@ -46,6 +46,7 @@ Feature: Debug your command in cucumber-test-run
     When I successfully run `cucumber`
     Then the features should all pass
 
+  @requires-readline
   Scenario: You can use a debug repl in your cli program
 
     If you want to debug a strange error, which only occures in one of your

diff --git a/features/07_development_of_aruba/run-aruba-console.feature b/features/07_development_of_aruba/run-aruba-console.feature
@@ -6,7 +6,7 @@ Feature: Running the interactive "aruba" developer console
 
   Scenario: Running aruba interactively
 
-    This starts a pry console with "aruba"'s api loaded.
+    This starts an IRB console with "aruba"'s api loaded.
 
     When I run `bin/console` interactively
     And I type "exit"

diff --git a/features/step_definitions/hooks.rb b/features/step_definitions/hooks.rb
@@ -103,6 +103,18 @@
   end
 end
 
+Before '@requires-readline' do
+  begin
+    require 'readline'
+  rescue LoadError
+    if Cucumber::VERSION < '2'
+      skip_invoke!
+    else
+      skip_this_scenario
+    end
+  end
+end
+
 Before '@unsupported-on-platform-unix' do |scenario|
   # leave if not windows
   next unless FFI::Platform.unix?