Merged r13861 and r13862 (#18789).

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13867 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index 1353881f6830cec1ceaef2b1b96957f99fb83022..e8058f7d8c250abda49aa8cd559573d7cb597766 100644 (file)
--- a/Gemfile
+++ b/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

diff --git a/test/ui/issues_test.rb b/test/ui/issues_test.rb
index 5225e2f2906246efb85f5440fdf6cc5cf389735b..b78b88597eea9038e1e86e8e415bb8c4b8d702f1 100644 (file)
--- a/test/ui/issues_test.rb
+++ b/test/ui/issues_test.rb
@@ -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