##// END OF EJS Templates
Merged r13861 and r13862 (#18789)....
Jean-Philippe Lang -
r13485:0c78d2cd8ca6
parent child
Show More
@@ -91,7 +91,7 group :test do
91 gem "shoulda-matchers", "1.4.1"
91 gem "shoulda-matchers", "1.4.1"
92 gem "mocha", "~> 1.0.0", :require => 'mocha/api'
92 gem "mocha", "~> 1.0.0", :require => 'mocha/api'
93 if RUBY_VERSION >= '1.9.3'
93 if RUBY_VERSION >= '1.9.3'
94 gem "capybara", "~> 2.1.0"
94 gem "capybara"
95 gem "selenium-webdriver"
95 gem "selenium-webdriver"
96 end
96 end
97 end
97 end
@@ -237,6 +237,8 class Redmine::UiTest::IssuesTest < Redmine::UiTest::Base
237 within('#context-menu') do
237 within('#context-menu') do
238 click_link 'Watch'
238 click_link 'Watch'
239 end
239 end
240 # wait for ajax response
241 assert page.has_css?('#context-menu .issue-1-watcher.icon-fav')
240 assert page.has_css?('tr#issue-1')
242 assert page.has_css?('tr#issue-1')
241 end
243 end
242 assert Issue.find(1).watched_by?(User.find_by_login('jsmith'))
244 assert Issue.find(1).watched_by?(User.find_by_login('jsmith'))
@@ -254,6 +256,8 class Redmine::UiTest::IssuesTest < Redmine::UiTest::Base
254 within('#context-menu') do
256 within('#context-menu') do
255 click_link 'Watch'
257 click_link 'Watch'
256 end
258 end
259 # wait for ajax response
260 assert page.has_css?('#context-menu .issue-bulk-watcher.icon-fav')
257 assert page.has_css?('tr#issue-1')
261 assert page.has_css?('tr#issue-1')
258 assert page.has_css?('tr#issue-4')
262 assert page.has_css?('tr#issue-4')
259 end
263 end
General Comments 0
You need to be logged in to leave comments. Login now