##// END OF EJS Templates
code layout cleanup test/integration/account_test.rb...
Toshi MARUYAMA -
r11437:8cbd91214def
parent child
Show More
@@ -118,7 +118,9 class AccountTest < ActionController::IntegrationTest
118 assert_select 'input[name=new_password]'
118 assert_select 'input[name=new_password]'
119 assert_select 'input[name=new_password_confirmation]'
119 assert_select 'input[name=new_password_confirmation]'
120
120
121 post "account/lost_password", :token => token.value, :new_password => 'newpass123', :new_password_confirmation => 'newpass123'
121 post "account/lost_password",
122 :token => token.value, :new_password => 'newpass123',
123 :new_password_confirmation => 'newpass123'
122 assert_redirected_to "/login"
124 assert_redirected_to "/login"
123 assert_equal 'Password was successfully updated.', flash[:notice]
125 assert_equal 'Password was successfully updated.', flash[:notice]
124
126
@@ -133,7 +135,9 class AccountTest < ActionController::IntegrationTest
133 assert_response :success
135 assert_response :success
134 assert_template 'account/register'
136 assert_template 'account/register'
135
137
136 post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar",
138 post 'account/register',
139 :user => {:login => "newuser", :language => "en",
140 :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar",
137 :password => "newpass123", :password_confirmation => "newpass123"}
141 :password => "newpass123", :password_confirmation => "newpass123"}
138 assert_redirected_to '/my/account'
142 assert_redirected_to '/my/account'
139 follow_redirect!
143 follow_redirect!
@@ -149,7 +153,9 class AccountTest < ActionController::IntegrationTest
149 def test_register_with_manual_activation
153 def test_register_with_manual_activation
150 Setting.self_registration = '2'
154 Setting.self_registration = '2'
151
155
152 post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar",
156 post 'account/register',
157 :user => {:login => "newuser", :language => "en",
158 :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar",
153 :password => "newpass123", :password_confirmation => "newpass123"}
159 :password => "newpass123", :password_confirmation => "newpass123"}
154 assert_redirected_to '/login'
160 assert_redirected_to '/login'
155 assert !User.find_by_login('newuser').active?
161 assert !User.find_by_login('newuser').active?
@@ -159,7 +165,9 class AccountTest < ActionController::IntegrationTest
159 Setting.self_registration = '1'
165 Setting.self_registration = '1'
160 Token.delete_all
166 Token.delete_all
161
167
162 post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar",
168 post 'account/register',
169 :user => {:login => "newuser", :language => "en",
170 :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar",
163 :password => "newpass123", :password_confirmation => "newpass123"}
171 :password => "newpass123", :password_confirmation => "newpass123"}
164 assert_redirected_to '/login'
172 assert_redirected_to '/login'
165 assert !User.find_by_login('newuser').active?
173 assert !User.find_by_login('newuser').active?
@@ -177,7 +185,9 class AccountTest < ActionController::IntegrationTest
177 def test_onthefly_registration
185 def test_onthefly_registration
178 # disable registration
186 # disable registration
179 Setting.self_registration = '0'
187 Setting.self_registration = '0'
180 AuthSource.expects(:authenticate).returns({:login => 'foo', :firstname => 'Foo', :lastname => 'Smith', :mail => 'foo@bar.com', :auth_source_id => 66})
188 AuthSource.expects(:authenticate).returns(
189 {:login => 'foo', :firstname => 'Foo', :lastname => 'Smith',
190 :mail => 'foo@bar.com', :auth_source_id => 66})
181
191
182 post '/login', :username => 'foo', :password => 'bar'
192 post '/login', :username => 'foo', :password => 'bar'
183 assert_redirected_to '/my/page'
193 assert_redirected_to '/my/page'
@@ -191,7 +201,8 class AccountTest < ActionController::IntegrationTest
191 def test_onthefly_registration_with_invalid_attributes
201 def test_onthefly_registration_with_invalid_attributes
192 # disable registration
202 # disable registration
193 Setting.self_registration = '0'
203 Setting.self_registration = '0'
194 AuthSource.expects(:authenticate).returns({:login => 'foo', :lastname => 'Smith', :auth_source_id => 66})
204 AuthSource.expects(:authenticate).returns(
205 {:login => 'foo', :lastname => 'Smith', :auth_source_id => 66})
195
206
196 post '/login', :username => 'foo', :password => 'bar'
207 post '/login', :username => 'foo', :password => 'bar'
197 assert_response :success
208 assert_response :success
@@ -201,7 +212,8 class AccountTest < ActionController::IntegrationTest
201 assert_no_tag :input, :attributes => { :name => 'user[login]' }
212 assert_no_tag :input, :attributes => { :name => 'user[login]' }
202 assert_no_tag :input, :attributes => { :name => 'user[password]' }
213 assert_no_tag :input, :attributes => { :name => 'user[password]' }
203
214
204 post 'account/register', :user => {:firstname => 'Foo', :lastname => 'Smith', :mail => 'foo@bar.com'}
215 post 'account/register',
216 :user => {:firstname => 'Foo', :lastname => 'Smith', :mail => 'foo@bar.com'}
205 assert_redirected_to '/my/account'
217 assert_redirected_to '/my/account'
206
218
207 user = User.find_by_login('foo')
219 user = User.find_by_login('foo')
General Comments 0
You need to be logged in to leave comments. Login now