Misc. Aruba compatibility

features/authentication.feature

@@ -33,9 +33,9 @@ Feature: OAuth authentication
     Then the output should contain "github.com username:"
     And the output should contain "github.com password for mislav (never stored):"
     And the exit status should be 0
-    And the file "../home/.config/hub" should contain "user: MiSlAv"
-    And the file "../home/.config/hub" should contain "oauth_token: OTOKEN"
-    And the file "../home/.config/hub" should have mode "0600"
+    And the file "~/.config/hub" should contain "user: MiSlAv"
+    And the file "~/.config/hub" should contain "oauth_token: OTOKEN"
+    And the file "~/.config/hub" should have mode "0600"
 
   Scenario: Prompt for username & password, receive personal access token
     Given the GitHub API server:

features/pull_request.feature

@@ -1265,7 +1265,7 @@ Feature: hub pull-request
     And "git push --set-upstream upstream HEAD:topic" should be run
 
   Scenario: Automatically retry when --push resulted in 422
-    Given The default aruba timeout is 7 seconds
+    Given The default aruba exit timeout is 7 seconds
     And the text editor adds:
       """
       hello!
@@ -1300,7 +1300,7 @@ Feature: hub pull-request
     And the file ".git/PULLREQ_EDITMSG" should not exist
 
   Scenario: Eventually give up on retries for --push
-    Given The default aruba timeout is 7 seconds
+    Given The default aruba exit timeout is 7 seconds
     And the text editor adds:
       """
       hello!

features/steps.rb

@@ -190,7 +190,7 @@ Then(/^"([^"]+)" should not be run$/) do |pattern|
 end
 
 Then(/^there should be no output$/) do
-  assert_exact_output('', all_output)
+  expect(all_output).to eq('')
 end
 
 Then(/^the git command should be unchanged$/) do
@@ -222,10 +222,8 @@ Then(/^there should be no "([^"]*)" remote$/) do |remote_name|
 end
 
 Then(/^the file "([^"]*)" should have mode "([^"]*)"$/) do |file, expected_mode|
-  prep_for_fs_check do
-    mode = File.stat(file).mode
-    expect(mode.to_s(8)).to match(/#{expected_mode}$/)
-  end
+  mode = File.stat(expand_path(file)).mode
+  expect(mode.to_s(8)).to match(/#{expected_mode}$/)
 end
 
 Given(/^the file named "(.+?)" is older than hub source$/) do |file|

features/support/env.rb

@@ -181,7 +181,7 @@ World Module.new {
     message.to_s.gsub(/['"\\ $]/) { |m| "\\#{m}" }
   end
 
-  %w[output_from stdout_from stderr_from all_stdout all_stderr].each do |m|
+  %w[output_from stdout_from stderr_from all_output all_stdout all_stderr].each do |m|
     define_method(m) do |*args|
       home = aruba.environment['HOME'].to_s
       output = super(*args)