bterkuile/mozo-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Green specs 😄

Browse Source
This commit is contained in:
Benjamin ter Kuile
2014-10-02 13:10:25 +02:00
parent faaa06f0dc
commit 7c03b4c32c
13 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Procfile
+2 -2
View File
@@ -1,7 +1,7 @@
#web: bundle exec thin start -p $PORT #web: bundle exec thin start -p $PORT
faye: thin start -R faye/config.ru -p 9296 faye: thin start -R faye/config.ru -p 9296 --pid tmp/pids/faye.pid
# production: faye: thin start -d -R faye/config.ru -p 9296 # production: faye: thin start -d -R faye/config.ru -p 9296
counters: bin/drb_counter.rb run counters: bin/drb_counter.rb run -- development
# production: conters: bin/drb_counter.rb start # production: conters: bin/drb_counter.rb start
#database: echo "BuenosAires" | sudo -S couchdb start | ~/bin/couch_output #database: echo "BuenosAires" | sudo -S couchdb start | ~/bin/couch_output
#server: rails s #server: rails s
app/assets/javascripts/user/app/app.js.coffee
+6 -3
View File
@@ -13,14 +13,17 @@
obtain_token: (message)-> obtain_token: (message)->
message ||= '' message ||= ''
auth_win = window.open $obtain_token_url, "_blank", "location=no" auth_win = window.open $obtain_token_url, "_blank", "location=no"
auth_win.addEventListener "loadstart", (event)-> auth_win.addEventListener "loadstart", (event)=>
if event.url.match 'close_window' if event.url.match 'close_window'
user_id = event.url.match(/user_id=([\w+-]+)/)[1] user_id = event.url.match(/user_id=([\w+-]+)/)[1]
auth_token = event.url.match(/authentication_token=([\w-]+)/)[1] auth_token = event.url.match(/authentication_token=([\w-]+)/)[1]
Qstorage.setItem 'user_id', user_id @handleAuthInfo(user_id, auth_token)
Qstorage.setItem 'auth_token', auth_token
auth_win.close() auth_win.close()
true true
handleAuthInfo: (user_id, auth_token)->
Qstorage.setItem 'user_id', user_id
Qstorage.setItem 'auth_token', auth_token
@__container__.lookup('controller:application').setCurrentList()
App.deferReadiness() App.deferReadiness()
Ember.$.ajaxPrefilter (options) -> Ember.$.ajaxPrefilter (options) ->
if options.type.toUpperCase() == 'GET' if options.type.toUpperCase() == 'GET'
app/views/dashboard/close_window.html.erb
+11 -1
View File
@@ -1,7 +1,17 @@
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<script>localStorage.setItem('auth_token', '<%= params[:authentication_token] %>'); localStorage.setItem('user_id', '<%= params[:user_id] %>');window.close()</script> <script>
if(window.parent && window.opener.App && window.opener.App.handleAuthInfo){
window.opener.App.handleAuthInfo('<%= params[:user_id] %>', '<%= params[:authentication_token] %>');
window.close();
}else{
localStorage.setItem('auth_token', '<%= params[:authentication_token] %>');
localStorage.setItem('user_id', '<%= params[:user_id] %>');
window.close();
setTimeout(function(){alert('Something went wrong. Please restart the application and warnd the Mozo crew it the proplem persists')}, 5000);
}
</script>
</head> </head>
<body></body> <body></body>
</html> </html>
spec/acceptance/users/active_list.feature
+4 -4
View File
@@ -2,7 +2,7 @@ Feature: Active list view
@javascript @javascript
Scenario: Loading lists and switching back to the active list works, lists loading may unlink active list orders Scenario: Loading lists and switching back to the active list works, lists loading may unlink active list orders
Given There is an open supplier with a menu Given there is an open supplier with a menu
And there is a signed in user with an active order And there is a signed in user with an active order
And the user is on the active list page And the user is on the active list page
When the user opens the side menu When the user opens the side menu
@@ -13,7 +13,7 @@ Feature: Active list view
@javascript @javascript
Scenario: Order disappears and counter adjusts when a placed order is cancelled Scenario: Order disappears and counter adjusts when a placed order is cancelled
Given There is an open supplier with a menu Given there is an open supplier with a menu
And there is a signed in user with a placed order And there is a signed in user with a placed order
And the user is on the active list page And the user is on the active list page
And the supplier orders placed counter for the user should be 1 And the supplier orders placed counter for the user should be 1
@@ -24,7 +24,7 @@ Feature: Active list view
@javascript @javascript
Scenario: Order disappears and counter adjusts when an active order is cancelled Scenario: Order disappears and counter adjusts when an active order is cancelled
Given There is an open supplier with a menu Given there is an open supplier with a menu
And there is a signed in user with an active order And there is a signed in user with an active order
And the user is on the active list page And the user is on the active list page
And the supplier orders in process counter for the user should be 1 And the supplier orders in process counter for the user should be 1
@@ -35,7 +35,7 @@ Feature: Active list view
@javascript @javascript
Scenario: Two users on the same list when one place an order Scenario: Two users on the same list when one place an order
Given There is an open supplier with a menu Given there is an open supplier with a menu
And there is a signed in user with an active order And there is a signed in user with an active order
And the user is on the active list page And the user is on the active list page
And there is another signed in user on the same list And there is another signed in user on the same list
spec/acceptance/users/changing_table.feature
+2 -2
View File
@@ -2,7 +2,7 @@ Feature: Changing table
@javascript @javascript
Scenario: Scanning a table not yet occupied and change to it Scenario: Scanning a table not yet occupied and change to it
Given There is an open supplier with a menu Given there is an open supplier with a menu
And there is a signed in user with an active order And there is a signed in user with an active order
And the user is on the homepage And the user is on the homepage
And there is another table And there is another table
@@ -15,7 +15,7 @@ Feature: Changing table
@javascript @javascript
Scenario: Scanning a table already occupied Scenario: Scanning a table already occupied
Given There is an open supplier with a menu Given there is an open supplier with a menu
And there is a signed in user with an active order And there is a signed in user with an active order
And the user is on the homepage And the user is on the homepage
And there is another table with an active list of another user And there is another table with an active list of another user
spec/acceptance/users/get_product_information.feature
+1 -1
View File
@@ -2,7 +2,7 @@ Feature: Getting product information during an order
@javascript @javascript
Scenario: Happy flow Scenario: Happy flow
Given There is an open supplier with a menu Given there is an open supplier with a menu
And the product 'Heineken beer' has description 'Brewed in Amsterdam' And the product 'Heineken beer' has description 'Brewed in Amsterdam'
And I am signed in as a user And I am signed in as a user
And I am on the user homepage And I am on the user homepage
spec/acceptance/users/join_an_occupied_table.feature
+2 -2
View File
@@ -2,7 +2,7 @@ Feature: Joining an occupied table
@javascript @javascript
Scenario: Happy flow Scenario: Happy flow
Given There is an open supplier with a menu Given there is an open supplier with a menu
And there is a signed in user with an active order And there is a signed in user with an active order
And I am on the user homepage And I am on the user homepage
When another user scans the QR code on the table When another user scans the QR code on the table
@@ -16,7 +16,7 @@ Feature: Joining an occupied table
@javascript @javascript
Scenario: Original user rejects the join request Scenario: Original user rejects the join request
Given There is an open supplier with a menu Given there is an open supplier with a menu
And there is a signed in user with an active order And there is a signed in user with an active order
And I am on the user homepage And I am on the user homepage
When another user scans the QR code on the table When another user scans the QR code on the table
spec/acceptance/users/order_a_product.feature
+3 -3
View File
@@ -2,7 +2,7 @@ Feature: Ordering a product as a user
@javascript @javascript
Scenario: Happy flow Scenario: Happy flow
Given There is an open supplier with a menu Given there is an open supplier with a menu
And I am signed in as a user And I am signed in as a user
And I am on the user homepage And I am on the user homepage
When the user scans a table QR code When the user scans a table QR code
@@ -27,7 +27,7 @@ Feature: Ordering a product as a user
@javascript @javascript
Scenario: Resetting an active order Scenario: Resetting an active order
Given There is an open supplier with a menu Given there is an open supplier with a menu
And I am signed in as a user And I am signed in as a user
And I am on the user homepage And I am on the user homepage
When the user scans a table QR code When the user scans a table QR code
@@ -43,7 +43,7 @@ Feature: Ordering a product as a user
@javascript @javascript
Scenario: Loading lists and switching to the order products view works, lists loading may unlink active list orders Scenario: Loading lists and switching to the order products view works, lists loading may unlink active list orders
Given There is an open supplier with a menu Given there is an open supplier with a menu
And there is a signed in user with an active order And there is a signed in user with an active order
And the user has an older list for the same supplier And the user has an older list for the same supplier
And I wait 1 second And I wait 1 second
spec/acceptance/users/sign_up_with_facebook.feature
+5 -4
View File
@@ -28,13 +28,14 @@ Feature: Sign up as user using facebook
And I wait 4 seconds And I wait 4 seconds
Then the newly created user info should be stored in the local storage Then the newly created user info should be stored in the local storage
@javascipt @javascript
Scenario: Authenciation when there is a list already active Scenario: Authenciation when there is a list already active
Given there is a confirmed and open supplier Given there is a confirmed and open supplier
And there is a user And there is a facebook user
And the user has an active order And the user has an active order
When the user authenticates with facebook When I visit the user obtain token path
Then the user should be redirected to the active list page And I wait 1 second
Then the user should be redirected to the user order overview page
Scenario: Facebook problem OmniAuth.config.mock_auth[:facebook] = :invalid_credentials Scenario: Facebook problem OmniAuth.config.mock_auth[:facebook] = :invalid_credentials
Scenario: Valid facebook login, but declines information requested by scope Scenario: Valid facebook login, but declines information requested by scope
spec/acceptance_steps/global_list_steps.rb
+1 -1
View File
@@ -10,7 +10,7 @@ end
step "the user has an active list with a/an :order_status order" do |order_status| step "the user has an active list with a/an :order_status order" do |order_status|
@list = create :list, supplier: @supplier, table: @table, user_ids: [@user.id] @list = create :list, supplier: @supplier, table: @table, user_ids: [@user.id]
@product ||= create :product, supplier: @supplier, name: 'Beer', price: 2.34 @product ||= create :product, supplier: @supplier, name: 'Beer', price: 2.34
@order = create :order, order_status.to_sym, supplier: @supplier, list: @list @order = create :order, order_status.to_sym, supplier: @supplier, list: @list, user: @user
@product_order = create :product_order, order: @order, product: @product, quantity: 2, price: 2.34 @product_order = create :product_order, order: @order, product: @product, quantity: 2, price: 2.34
@user.reload @user.reload
@user.active_list_id = @list.id @user.active_list_id = @list.id
spec/acceptance_steps/supplier_steps.rb
+1 -1
View File
@@ -1,4 +1,4 @@
step "There is an open supplier with a menu" do step "there is an open supplier with a menu" do
step 'there is a confirmed and open supplier' step 'there is a confirmed and open supplier'
@apple_pie= create :product, name: 'Apple pie', supplier: @supplier, price: 4.28 @apple_pie= create :product, name: 'Apple pie', supplier: @supplier, price: 4.28
@heineken_beer = create :product, name: 'Heineken beer', supplier: @supplier, price: 2.34 @heineken_beer = create :product, name: 'Heineken beer', supplier: @supplier, price: 2.34
spec/acceptance_steps/users/authentication_steps.rb
+7 -1
View File
@@ -14,8 +14,14 @@ step "there is a user" do
@user ||= create :user @user ||= create :user
end end
step "there is a facebook user" do
if @user
raise "There already is a user, but not a facebook user"
else
@user ||= create :user, provider: 'facebook', uid: '123456790' # uid from spec_helper oauth setup
end
end
step "I am signed in as a user" do step "I am signed in as a user" do
step "there is a confirmed and open supplier"
step "there is a user" step "there is a user"
visit test_login_admin_users_path(email: @user.email) visit test_login_admin_users_path(email: @user.email)
end end
wip.md
+1
View File
@@ -4,6 +4,7 @@ Release
Supplier Supplier
-------- --------
- SETTINGS SUBMIT EXPRESSIVE!!!!!!
- english emails - english emails
- form action button looks (Roos) - form action button looks (Roos)
- Add qr print functionality offering to send the stickers - Add qr print functionality offering to send the stickers