diff options
author | azul <azul@leap.se> | 2014-05-30 18:02:20 +0200 |
---|---|---|
committer | azul <azul@leap.se> | 2014-05-30 18:02:20 +0200 |
commit | 9f04e4c8e50f1dc5a7ff6f2e58974254731a6bc4 (patch) | |
tree | 84db71a6e52c47bc2f2f1aabce578ce367fcb0e8 /test/integration | |
parent | 568a5c243f0a0ef90807c96b19643ec341994bbb (diff) | |
parent | 9e3be686ff2751707369894382293924420830d0 (diff) |
Merge pull request #167 from azul/feature/i18n-for-ticket-system0.5.2-rc
Feature/i18n for ticket system
Diffstat (limited to 'test/integration')
-rw-r--r-- | test/integration/browser/account_test.rb | 6 | ||||
-rw-r--r-- | test/integration/browser/session_test.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/integration/browser/account_test.rb b/test/integration/browser/account_test.rb index 8e6d433..aea5406 100644 --- a/test/integration/browser/account_test.rb +++ b/test/integration/browser/account_test.rb @@ -9,7 +9,7 @@ class AccountTest < BrowserIntegrationTest test "signup successfully" do username, password = submit_signup assert page.has_content?("Welcome #{username}") - click_on 'Logout' + click_on 'Log Out' assert page.has_content?("Log In") assert_equal '/', current_path assert user = User.find_by_login(username) @@ -30,7 +30,7 @@ class AccountTest < BrowserIntegrationTest test "successful login" do username, password = submit_signup - click_on 'Logout' + click_on 'Log Out' attempt_login(username, password) assert page.has_content?("Welcome #{username}") within('.sidenav li.active') do @@ -90,7 +90,7 @@ class AccountTest < BrowserIntegrationTest fill_in 'Password confirmation', with: "other password" click_on 'Save' end - click_on 'Logout' + click_on 'Log Out' attempt_login(@user.login, "other password") assert page.has_content?("Welcome #{@user.login}") end diff --git a/test/integration/browser/session_test.rb b/test/integration/browser/session_test.rb index fb20847..d52508a 100644 --- a/test/integration/browser/session_test.rb +++ b/test/integration/browser/session_test.rb @@ -4,7 +4,7 @@ class SessionTest < BrowserIntegrationTest test "valid session" do login - assert page.has_content?("Logout") + assert page.has_content?("Log Out") end test "expired session" do |