Improve supplier settings logick

spec/acceptance/suppliers/settings.feature

@@ -1,5 +1,15 @@
 Feature: Manage settings
 
+  @javascript
+  Scenario: Changing the name
+    Given there is a confirmed and open supplier
+    And I am signed in as supplier
+    And I visit the supplier settings path
+    When the supplier changes the name to "Test8" in the settings page
+    And the supplier submits the supplier settings form
+    Then the supplier should be redirected to the root path
+    And the supplier name in the page should be "Test8"
+
   @javascript
   Scenario: Changing the supplier email
     Given there is a confirmed and open supplier
@@ -12,7 +22,7 @@ Feature: Manage settings
     And the supplier unconfirmed email should have been set to the new supplier email
     And an email should have been sent to the original supplier email with email confirmation instructions
     When the supplier clicks on the new email confirmation link
-    Then the supplier gets redirected to the supplier settings path
+    Then the supplier should be redirected to the supplier settings path
     And the supplier email is the new email and the unconfirmed email is empty
 
   @javascript @broken

spec/acceptance/suppliers/signup.feature

@@ -1,11 +1,13 @@
 Feature: A supplier can sign up
+
+  @javascript
   Scenario: It works
     When I visit the supplier signup path
     And fill in the supplier signup form with new credentials
     And click on the supplier signup submit button
+    And I wait 1 second
     Then a new unconfirmed supplier with the new signup credentials should be created
     And a supplier signup confirmation mail should be sent containing a link to the token
     When I visit the supplier signup confirmation path with the correct token
     Then the new signup supplier should be confirmed
-    And I should be redirected to the supplier settings page
-
+    And the supplier should be redirected to the supplier settings path

spec/acceptance_steps/supplier_steps.rb

@@ -23,3 +23,7 @@ step "the supplier has a night offset of :minutes minutes" do |minutes|
   @supplier.night_offset = minutes
   @supplier.save
 end
+
+step "the supplier name in the page should be :name" do |name|
+  page.find('.top-menu .supplier-name').text.should == name
+end

spec/acceptance_steps/suppliers/navigation_steps.rb

@@ -22,3 +22,10 @@ end
 step "I visit the supplier settings path" do
   visit "/supplier#/settings"
 end
+
+
+## ASSERTIONS
+
+step "the supplier should be redirected to the root path" do
+  ember_route.should == '/'
+end

spec/acceptance_steps/suppliers/settings_steps.rb

@@ -27,12 +27,17 @@ step "an email should have been sent to the original supplier email with email c
   @confirmation_link = confirmation_link_match[1]
 end
 
+step "the supplier changes the name to :name in the settings page" do |new_name|
+  page.find('input.supplier-name').set new_name
+end
+
 step "the supplier clicks on the new email confirmation link" do
   visit @confirmation_link
 end
 
-step "the supplier gets redirected to the supplier settings path" do
-  route_should_be 'supplier#edit'
+step "the supplier should be redirected to the supplier settings path" do
+  # route_should_be 'supplier#edit'
+  ember_route.should == '/settings'
 end
 
 step "the supplier email is the new email and the unconfirmed email is empty" do

spec/support/route_helpers.rb

@@ -19,6 +19,9 @@ module SpecRouteHelpers
   end
 
   def ember_route
-    page.evaluate_script %|App.__container__.lookup('router:main').location.lastSetURL|
+    # currentRouteName does not include model information: /list/123 => currentRouteName == 'list'
+    # page.evaluate_script %|App.__container__.lookup('controller:application').get('currentRouteName')|
+    # page.evaluate_script %|App.__container__.lookup('router:main').location.lastSetURL| # not working for direct path supplier#/settings
+    page.evaluate_script %{App.__container__ && (window.location.hash || "#/").substr(1)}
   end
 end