projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 5365-not-link-unreadables
[arvados.git]
/
apps
/
workbench
/
test
/
integration
/
application_layout_test.rb
diff --git
a/apps/workbench/test/integration/application_layout_test.rb
b/apps/workbench/test/integration/application_layout_test.rb
index 6ec535b7b6ec99aa9e319e2a494545bf4c6fa493..84acdc61148e91b14a1b365928dec786a5f612e9 100644
(file)
--- a/
apps/workbench/test/integration/application_layout_test.rb
+++ b/
apps/workbench/test/integration/application_layout_test.rb
@@
-1,12
+1,13
@@
require 'integration_helper'
require 'integration_helper'
-require 'selenium-webdriver'
-require 'headless'
class ApplicationLayoutTest < ActionDispatch::IntegrationTest
class ApplicationLayoutTest < ActionDispatch::IntegrationTest
+ # These tests don't do state-changing API calls. Save some time by
+ # skipping the database reset.
+ reset_api_fixtures :after_each_test, false
+ reset_api_fixtures :after_suite, true
+
setup do
setup do
- headless = Headless.new
- headless.start
- Capybara.current_driver = :selenium
+ need_javascript
end
def verify_homepage user, invited, has_profile
end
def verify_homepage user, invited, has_profile
@@
-21,7
+22,8
@@
class ApplicationLayoutTest < ActionDispatch::IntegrationTest
if profile_config && !has_profile
assert page.has_text?('Save profile'), 'No text - Save profile'
else
if profile_config && !has_profile
assert page.has_text?('Save profile'), 'No text - Save profile'
else
- assert page.has_text?('My projects'), 'Not found text - My projects'
+ assert page.has_link?("Projects"), 'Not found link - Projects'
+ page.find("#projects-menu").click
assert page.has_text?('Projects shared with me'), 'Not found text - Project shared with me'
end
elsif invited
assert page.has_text?('Projects shared with me'), 'Not found text - Project shared with me'
end
elsif invited
@@
-32,9
+34,12
@@
class ApplicationLayoutTest < ActionDispatch::IntegrationTest
within('.navbar-fixed-top') do
if !user
within('.navbar-fixed-top') do
if !user
+ assert_text Rails.configuration.site_name.downcase
+ assert_no_selector 'a', text: Rails.configuration.site_name.downcase
assert page.has_link?('Log in'), 'Not found link - Log in'
else
# my account menu
assert page.has_link?('Log in'), 'Not found link - Log in'
else
# my account menu
+ assert_selector 'a', text: Rails.configuration.site_name.downcase
assert page.has_link?("#{user['email']}"), 'Not found link - email'
find('a', text: "#{user['email']}").click
within('.dropdown-menu') do
assert page.has_link?("#{user['email']}"), 'Not found link - email'
find('a', text: "#{user['email']}").click
within('.dropdown-menu') do