From 1928e5624ece1f044b9e200e6b67384807b510a6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 13 Mar 2017 21:39:04 +0000
Subject: [PATCH] Fixes ui tests.

git-svn-id: http://svn.redmine.org/redmine/trunk@16397 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/ui/issues_test_ui.rb    |  4 ++--
 test/ui/sudo_mode_test_ui.rb | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/test/ui/issues_test_ui.rb b/test/ui/issues_test_ui.rb
index 0ab5d6a8b..e19497edc 100644
--- a/test/ui/issues_test_ui.rb
+++ b/test/ui/issues_test_ui.rb
@@ -206,8 +206,8 @@ class Redmine::UiTest::IssuesTest < Redmine::UiTest::Base
       :trackers => Tracker.where(:name => 'Feature request')
     )
 
-    Role.non_member.add_permission! :edit_issues
-    Role.non_member.remove_permission! :add_issues, :add_issue_notes
+    Role.non_member.add_permission! :edit_issues, :add_issues
+    Role.non_member.remove_permission! :add_issue_notes
 
     log_user('someone', 'foo')
     visit '/issues/1'
diff --git a/test/ui/sudo_mode_test_ui.rb b/test/ui/sudo_mode_test_ui.rb
index f5e6f20b2..fc79c33a2 100644
--- a/test/ui/sudo_mode_test_ui.rb
+++ b/test/ui/sudo_mode_test_ui.rb
@@ -22,10 +22,18 @@ class Redmine::UiTest::SudoModeTest < Redmine::UiTest::Base
 
   def setup
     Redmine::SudoMode.stubs(:enabled?).returns(true)
+    super
+  end
+
+  def teardown
+    travel_back
+    super
   end
 
   def test_add_user
     log_user('admin', 'admin')
+    expire_sudo_mode!
+    
     visit '/users/new'
 
     assert_difference 'User.count' do
@@ -50,4 +58,11 @@ class Redmine::UiTest::SudoModeTest < Redmine::UiTest::Base
       end
     end
   end
+
+  private
+
+  # sudo mode is active after sign, let it expire by advancing the time
+  def expire_sudo_mode!
+    travel_to 20.minutes.from_now
+  end
 end