mirror of
https://github.com/redmine/redmine.git
synced 2026-03-23 21:00:42 +01:00
Merged r13861 and r13862 (#18789).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13867 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
2
Gemfile
2
Gemfile
@@ -91,7 +91,7 @@ group :test do
|
||||
gem "shoulda-matchers", "1.4.1"
|
||||
gem "mocha", "~> 1.0.0", :require => 'mocha/api'
|
||||
if RUBY_VERSION >= '1.9.3'
|
||||
gem "capybara", "~> 2.1.0"
|
||||
gem "capybara"
|
||||
gem "selenium-webdriver"
|
||||
end
|
||||
end
|
||||
|
||||
@@ -237,6 +237,8 @@ class Redmine::UiTest::IssuesTest < Redmine::UiTest::Base
|
||||
within('#context-menu') do
|
||||
click_link 'Watch'
|
||||
end
|
||||
# wait for ajax response
|
||||
assert page.has_css?('#context-menu .issue-1-watcher.icon-fav')
|
||||
assert page.has_css?('tr#issue-1')
|
||||
end
|
||||
assert Issue.find(1).watched_by?(User.find_by_login('jsmith'))
|
||||
@@ -254,6 +256,8 @@ class Redmine::UiTest::IssuesTest < Redmine::UiTest::Base
|
||||
within('#context-menu') do
|
||||
click_link 'Watch'
|
||||
end
|
||||
# wait for ajax response
|
||||
assert page.has_css?('#context-menu .issue-bulk-watcher.icon-fav')
|
||||
assert page.has_css?('tr#issue-1')
|
||||
assert page.has_css?('tr#issue-4')
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user