summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2014-11-30 15:02:47 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2014-11-30 15:02:47 +0000
commit78e6717ba70f4b5e24012bc29d3e12c0e38adf04 (patch)
treef110d609986f6f5b44a4464c3aeabdb7617b4e1c
parentef5ff1630acbc33ee4a9571b913ada1996d2c4ad (diff)
downloadredmine-78e6717ba70f4b5e24012bc29d3e12c0e38adf04.tar.gz
redmine-78e6717ba70f4b5e24012bc29d3e12c0e38adf04.zip
Test cleanup.
git-svn-id: http://svn.redmine.org/redmine/trunk@13678 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--test/integration/layout_test.rb4
-rw-r--r--test/test_helper.rb6
2 files changed, 1 insertions, 9 deletions
diff --git a/test/integration/layout_test.rb b/test/integration/layout_test.rb
index fd9ddc28e..b4f472a75 100644
--- a/test/integration/layout_test.rb
+++ b/test/integration/layout_test.rb
@@ -36,9 +36,7 @@ class LayoutTest < ActionDispatch::IntegrationTest
end
test "browsing to an unauthorized page should render the base layout" do
- change_user_password('miscuser9', 'test1234')
-
- log_user('miscuser9','test1234')
+ log_user('jsmith','jsmith')
get "/admin"
assert_response :forbidden
diff --git a/test/test_helper.rb b/test/test_helper.rb
index b374a1422..27acdfc91 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -132,12 +132,6 @@ class ActiveSupport::TestCase
::I18n.locale = saved_localed
end
- def change_user_password(login, new_password)
- user = User.where(:login => login).first
- user.password, user.password_confirmation = new_password, new_password
- user.save!
- end
-
def self.ldap_configured?
@test_ldap = Net::LDAP.new(:host => '127.0.0.1', :port => 389)
return @test_ldap.bind