diff --git a/Procfile b/Procfile index 17ec0be5..92f24260 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,3 @@ web: bundle exec thin start -p $PORT -faye: rackup faye.ru -s thin -E production +faye: thin start -R faye/config.ru -p 9296 +#faye: rackup faye.ru -s thin -E production diff --git a/faye/config.ru b/faye/config.ru index 11920c6a..b0eeb680 100644 --- a/faye/config.ru +++ b/faye/config.ru @@ -12,6 +12,7 @@ class ServerAuth end end +Faye::WebSocket.load_adapter('thin') faye_server = Faye::RackAdapter.new(mount: '/faye', timeout: 45) #faye_server.listen 9296 faye_server.add_extension(ServerAuth.new) diff --git a/spec/acceptance/suppliers/supplier_main_board.feature b/spec/acceptance/suppliers/supplier_main_board.feature index afde06d8..6f735c3f 100644 --- a/spec/acceptance/suppliers/supplier_main_board.feature +++ b/spec/acceptance/suppliers/supplier_main_board.feature @@ -1,64 +1,64 @@ Feature: Supplier main board - #@javascript - #Scenario: the active list should be present and contained in row having its id - #Given there is an active list and order - #And I am signed in as supplier + @javascript + Scenario: the active list should be present and contained in row having its id + Given there is an active list and order + And I am signed in as supplier - #When I visit the supplier root path - #Then the supplier dashboard should display the active list - #And the supplier dashboard should display the active order + When I visit the supplier root path + Then the supplier dashboard should display the active list + And the supplier dashboard should display the active order - #When I click on translation 'supplier.order.being_processed' - ## waiting here only needed in old style implementation - #And I wait 1 second - #Then the supplier order row should be marked as active + When I click on translation 'supplier.order.being_processed' + # waiting here only needed in old style implementation + And I wait 1 second + Then the supplier order row should be marked as active - #When I click on translation 'supplier.order.being_served' - #And I wait 1 second - #Then the order in the supplier dashboard should not be displayed anymore - #And the order should be marked as delivered + When I click on translation 'supplier.order.being_served' + And I wait 1 second + Then the order in the supplier dashboard should not be displayed anymore + And the order should be marked as delivered - #And the list on the supplier dashboard should not be marked as in need of help - #When the list is marked as in need of help - ## waiting here only needed in old style implementation - #And I wait 1 second - #Then the list on the supplier dashboard should be marked as in need of help + And the list on the supplier dashboard should not be marked as in need of help + When the list is marked as in need of help + # waiting here only needed in old style implementation + And I wait 1 second + Then the list on the supplier dashboard should be marked as in need of help - #When I click on the mark list as helped button in the supplier dashboard - #Then the list on the supplier dashboard should not be marked as in need of help + When I click on the mark list as helped button in the supplier dashboard + Then the list on the supplier dashboard should not be marked as in need of help - #When the list is marked as in need of payment - #Then the list on the supplier dashboard should be marked as in need of payment + When the list is marked as in need of payment + Then the list on the supplier dashboard should be marked as in need of payment - #When another order is placed - #Then the supplier dashboard list should display the updated price - #And the new order should be present in the supplier dashboard + When another order is placed + Then the supplier dashboard list should display the updated price + And the new order should be present in the supplier dashboard - #When a new order on a table in another section is created - #And I wait 1 second - #Then the new list should appear in the supplier dashboard - #And the new order on a table in another section should be present in the supplier dashboard + When a new order on a table in another section is created + And I wait 1 second + Then the new list should appear in the supplier dashboard + And the new order on a table in another section should be present in the supplier dashboard - #When I click on the close list button in the supplier dashboard - #And I wait 1 second - #Then the list in the supplier dashboard should not be displayed anymore - #And the list should be marked as closed + When I click on the close list button in the supplier dashboard + And I wait 1 second + Then the list in the supplier dashboard should not be displayed anymore + And the list should be marked as closed - #@javascript - #Scenario: Selecting a specific section limits the result to the lists and orders of those sections - #Given there is an active list and order - #And I am signed in as supplier - #And a new order on a table in another section is created - #Then I should see the list and the new list - #And I should see the order and the new order - #When I select the section in the supplier dashboard - #Then I should see the list and order but not the new list and new order - #When I select the new section in the supplier dashboard - #Then I should see the new list and new order but not the list and order - #When I reset the section selector in the supplier dashboard - #Then I should see the list and the new list - #And I should see the order and the new order + @javascript + Scenario: Selecting a specific section limits the result to the lists and orders of those sections + Given there is an active list and order + And I am signed in as supplier + And a new order on a table in another section is created + Then I should see the list and the new list + And I should see the order and the new order + When I select the section in the supplier dashboard + Then I should see the list and order but not the new list and new order + When I select the new section in the supplier dashboard + Then I should see the new list and new order but not the list and order + When I reset the section selector in the supplier dashboard + Then I should see the list and the new list + And I should see the order and the new order @javascript Scenario: Selecting a specific section and jumping towards section view diff --git a/wip.md b/wip.md new file mode 100644 index 00000000..44464802 --- /dev/null +++ b/wip.md @@ -0,0 +1,10 @@ +- suppliers + - user names in orders + - better product listing with time of day in products overview + - english emails + - remove kassasysteem from emails + - https://github.com/buytruckload/geonames_api + - website call to actions + +- users +