Compensate for variable sorting in bash shell completion

Fixes https://travis-ci.org/github/hub/jobs/13920941

features/bash_completion.feature

@@ -18,12 +18,12 @@ Feature: bash tab-completion
   Scenario: Offers pull-request flags
     When I type "git pull-request -" and press <Tab>
     When I press <Tab> again
-    Then the completion menu should offer "-F -b -f -h -i -m"
+    Then the completion menu should offer "-F -b -f -h -i -m" unsorted
 
   Scenario: Doesn't offer already used pull-request flags
     When I type "git pull-request -F myfile -h mybranch -" and press <Tab>
     When I press <Tab> again
-    Then the completion menu should offer "-b -f -i -m"
+    Then the completion menu should offer "-b -f -i -m" unsorted
 
   Scenario: Browse to issues
     When I type "git browse -- i" and press <Tab>

features/support/completion.rb

@@ -131,7 +131,7 @@ World Module.new {
 
   def tmux_wait_for_completion
     # bash can be pretty slow
-    sleep 0.6
+    sleep 1
   end
 
   def tmux_completion_menu
@@ -188,8 +188,12 @@ When(/^I press <Tab> again$/) do
   tmux_send_keys('Tab')
 end
 
-Then(/^the completion menu should offer "([^"]+?)"$/) do |items|
+Then(/^the completion menu should offer "([^"]+?)"( unsorted)?$/) do |items, unsorted|
   menu = tmux_completion_menu_basic
+  if unsorted
+    menu.sort!
+    items = items.split(' ').sort.join(' ')
+  end
   menu.join(' ').should eq(items)
 end