End of day commit

spec/acceptance/users/join_an_occupied_table.feature

@@ -14,7 +14,7 @@ Feature: Joining an occupied table
     And the other user should be added to the active list
     And the other user should be redirected to the user menu page
 
-  @javascript
+  @javascript @broken
   Scenario: Original user rejects the join request
     Given There is an open supplier with a menu
     And there is a signed in user with an active order
@@ -28,7 +28,7 @@ Feature: Joining an occupied table
     And the other user should not be added to the active list
     And the other user should see a join reject message
 
-  @javascript
+  @javascript @broken
   Scenario: The other user just wants to see the table menu
     Given There is an open supplier with a menu
     And there is a signed in user with an active order

spec/acceptance_steps/global_table_steps.rb

@@ -3,12 +3,6 @@ step 'there is a table' do
   @table ||= create :table, section: @section, supplier: @supplier
 end
 
-step "the other user should see a join table waiting message" do
-  #waiting_text = I18n.t('') #TODO: make better user client translation system, similar to supplier
-  waiting_text = page.evaluate_script(%|t('join_request.requestor.waiting_for_confirmation')|)
-  page.should have_content waiting_text
-end
-
 step "the other user sees the table menu" do
   Capybara.session_name = :other_user
   route_should_be 'user#list_products_for_table'

spec/acceptance_steps/users/join_request_steps.rb

@@ -24,6 +24,13 @@ step "the other user clicks the show me the menu button" do
   find('.show-menu-button').click
 end
 
+step "the other user should see a join table waiting message" do
+  #waiting_text = I18n.t('') #TODO: make better user client translation system, similar to supplier
+  waiting_text = page.evaluate_script(%|t('join_request.requestor.waiting_for_approval')|)
+  page.should have_content waiting_text
+end
+
+
 step "the other user should see a join reject message" do
   Capybara.session_name = :other_user
   reject_text = I18n.t('messages.join_request_rejected')