##// END OF EJS Templates
jro_apps » redmine
RSS
Removes calls to #assert_template and #assigns in integration tests....
Jean-Philippe Lang -
r15345:e1da6de36f0d
parent child
Show More
Side by Side Unified
Context file:
r15345:e1da6de36f0d Loading diff...:
Show file before | Show file after | Hide comments
@@ -27,7 +27,6 class AccountTest < Redmine::IntegrationTest
27 27
28 28 get "/my/account"
29 29 assert_response :success
30 assert_template "my/account"
31 30 end
32 31
33 32 def test_login_should_set_session_token
@@ -67,7 +66,6 class AccountTest < Redmine::IntegrationTest
67 66 cookies[:autologin] = token.value
68 67 get '/my/page'
69 68 assert_response :success
70 assert_template 'my/page'
71 69 assert_equal user.id, session[:user_id]
72 70 assert_not_nil user.reload.last_login_on
73 71 end
@@ -106,7 +104,6 class AccountTest < Redmine::IntegrationTest
106 104
107 105 get "/account/lost_password"
108 106 assert_response :success
109 assert_template "account/lost_password"
110 107 assert_select 'input[name=mail]'
111 108
112 109 post "/account/lost_password", :mail => 'jSmith@somenet.foo'
@@ -119,7 +116,6 class AccountTest < Redmine::IntegrationTest
119 116
120 117 get "/account/lost_password", :token => token.value
121 118 assert_response :success
122 assert_template "account/password_recovery"
123 119 assert_select 'input[type=hidden][name=token][value=?]', token.value
124 120 assert_select 'input[name=new_password]'
125 121 assert_select 'input[name=new_password_confirmation]'
@@ -202,7 +198,6 class AccountTest < Redmine::IntegrationTest
202 198
203 199 get '/account/register'
204 200 assert_response :success
205 assert_template 'account/register'
206 201
207 202 post '/account/register',
208 203 :user => {:login => "newuser", :language => "en",
@@ -211,7 +206,6 class AccountTest < Redmine::IntegrationTest
211 206 assert_redirected_to '/my/account'
212 207 follow_redirect!
213 208 assert_response :success
214 assert_template 'my/account'
215 209
216 210 user = User.find_by_login('newuser')
217 211 assert_not_nil user
@@ -275,7 +269,6 class AccountTest < Redmine::IntegrationTest
275 269
276 270 post '/login', :username => 'foo', :password => 'bar'
277 271 assert_response :success
278 assert_template 'account/register'
279 272 assert_select 'input[name=?][value=""]', 'user[firstname]'
280 273 assert_select 'input[name=?][value=Smith]', 'user[lastname]'
281 274 assert_select 'input[name=?]', 'user[login]', 0
Show file before | Show file after | Hide comments
@@ -30,7 +30,7 class AdminTest < Redmine::IntegrationTest
30 30 log_user("admin", "admin")
31 31 get "/users/new"
32 32 assert_response :success
33 assert_template "users/new"
33
34 34 post "/users",
35 35 :user => { :login => "psmith", :firstname => "Paul",
36 36 :lastname => "Smith", :mail => "psmith@somenet.foo",
Show file before | Show file after | Hide comments
@@ -129,7 +129,7 class Redmine::ApiTest::AuthenticationTest < Redmine::ApiTest::Base
129 129
130 130 get '/users/current', {}, {'X-Redmine-API-Key' => user.api_key, 'X-Redmine-Switch-User' => su.login}
131 131 assert_response :success
132 assert_equal su, assigns(:user)
132 assert_select 'h2', :text => su.name
133 133 assert_equal su, User.current
134 134 end
135 135
@@ -152,7 +152,7 class Redmine::ApiTest::AuthenticationTest < Redmine::ApiTest::Base
152 152
153 153 get '/users/current', {}, {'X-Redmine-API-Key' => user.api_key, 'X-Redmine-Switch-User' => su.login}
154 154 assert_response :success
155 assert_equal user, assigns(:user)
155 assert_select 'h2', :text => user.name
156 156 assert_equal user, User.current
157 157 end
158 158 end
Show file before | Show file after | Hide comments
@@ -46,8 +46,7 class Redmine::ApiTest::IssuesTest < Redmine::ApiTest::Base
46 46
47 47 test "GET /issues.xml should contain metadata" do
48 48 get '/issues.xml'
49 assert_select 'issues[type=array][total_count=?][limit="25"][offset="0"]',
50 assigns(:issue_count).to_s
49 assert_select 'issues[type=array][total_count][limit="25"][offset="0"]'
51 50 end
52 51
53 52 test "GET /issues.xml with nometa param should not contain metadata" do
@@ -62,9 +61,7 class Redmine::ApiTest::IssuesTest < Redmine::ApiTest::Base
62 61
63 62 test "GET /issues.xml with offset and limit" do
64 63 get '/issues.xml?offset=2&limit=3'
65
66 assert_equal 3, assigns(:limit)
67 assert_equal 2, assigns(:offset)
64 assert_select 'issues[type=array][total_count][limit="3"][offset="2"]'
68 65 assert_select 'issues issue', 3
69 66 end
70 67
Show file before | Show file after | Hide comments
@@ -25,8 +25,8 class Redmine::ApiTest::RolesTest < Redmine::ApiTest::Base
25 25
26 26 assert_response :success
27 27 assert_equal 'application/xml', @response.content_type
28 assert_equal 3, assigns(:roles).size
29 28
29 assert_select 'roles role', 3
30 30 assert_select 'roles[type=array] role id', :text => '2' do
31 31 assert_select '~ name', :text => 'Developer'
32 32 end
@@ -37,11 +37,11 class Redmine::ApiTest::RolesTest < Redmine::ApiTest::Base
37 37
38 38 assert_response :success
39 39 assert_equal 'application/json', @response.content_type
40 assert_equal 3, assigns(:roles).size
41 40
42 41 json = ActiveSupport::JSON.decode(response.body)
43 42 assert_kind_of Hash, json
44 43 assert_kind_of Array, json['roles']
44 assert_equal 3, json['roles'].size
45 45 assert_include({'id' => 2, 'name' => 'Developer'}, json['roles'])
46 46 end
47 47
Show file before | Show file after | Hide comments
@@ -48,29 +48,29 class Redmine::ApiTest::SearchTest < Redmine::ApiTest::Base
48 48 get '/search.xml', :q => '', :all_words => ''
49 49
50 50 assert_response :success
51 assert_equal 0, assigns(:results).size
51 assert_select 'result', 0
52 52 end
53 53
54 54 test "GET /search.xml with query strings should return results" do
55 get '/search.xml', :q => 'recipe subproject commit', :all_words => ''
55 issue = Issue.generate!(:subject => 'searchapi')
56
57 get '/search.xml', :q => 'searchapi', :all_words => ''
56 58
57 59 assert_response :success
58 assert_not_empty(assigns(:results))
59 60
60 61 assert_select 'results[type=array]' do
61 assert_select 'result', :count => assigns(:results).count
62 assigns(:results).size.times.each do |i|
62 assert_select 'result', 1
63
63 64 assert_select 'result' do
64 assert_select 'id', :text => assigns(:results)[i].id.to_s
65 assert_select 'title', :text => assigns(:results)[i].event_title
66 assert_select 'type', :text => assigns(:results)[i].event_type
67 assert_select 'url', :text => url_for(assigns(:results)[i].event_url(:only_path => false))
68 assert_select 'description', :text => assigns(:results)[i].event_description
65 assert_select 'id', :text => issue.id.to_s
66 assert_select 'title', :text => "Bug ##{issue.id} (New): searchapi"
67 assert_select 'type', :text => 'issue'
68 assert_select 'url', :text => "http://www.example.com/issues/#{issue.id}"
69 assert_select 'description', :text => ''
69 70 assert_select 'datetime'
70 71 end
71 72 end
72 73 end
73 end
74 74
75 75 test "GET /search.xml should paginate" do
76 76 issue = (0..10).map {Issue.generate! :subject => 'search_with_limited_results'}.reverse.map(&:id)
Show file before | Show file after | Hide comments
@@ -26,7 +26,7 class Redmine::ApiTest::UsersTest < Redmine::ApiTest::Base
26 26 assert_response :success
27 27 assert_equal 'application/xml', response.content_type
28 28 assert_select 'users' do
29 assert_select 'user', assigns(:users).size
29 assert_select 'user', User.active.count
30 30 end
31 31 end
32 32
@@ -37,7 +37,7 class Redmine::ApiTest::UsersTest < Redmine::ApiTest::Base
37 37 assert_equal 'application/json', response.content_type
38 38 json = ActiveSupport::JSON.decode(response.body)
39 39 assert json.key?('users')
40 assert_equal assigns(:users).size, json['users'].size
40 assert_equal User.active.count, json['users'].size
41 41 end
42 42
43 43 test "GET /users/:id.xml should return the user" do
Show file before | Show file after | Hide comments
@@ -40,7 +40,6 class IssuesTest < Redmine::IntegrationTest
40 40
41 41 get '/projects/ecookbook/issues/new'
42 42 assert_response :success
43 assert_template 'issues/new'
44 43
45 44 issue = new_record(Issue) do
46 45 post '/projects/ecookbook/issues',
@@ -58,7 +57,6 class IssuesTest < Redmine::IntegrationTest
58 57 # check redirection
59 58 assert_redirected_to :controller => 'issues', :action => 'show', :id => issue
60 59 follow_redirect!
61 assert_equal issue, assigns(:issue)
62 60
63 61 # check issue attributes
64 62 assert_equal 'jsmith', issue.author.login
Show file before | Show file after | Hide comments
@@ -25,7 +25,7 class ProjectsTest < Redmine::IntegrationTest
25 25 log_user("admin", "admin")
26 26 get "/admin/projects"
27 27 assert_response :success
28 assert_template "admin/projects"
28
29 29 post "/projects/1/archive"
30 30 assert_redirected_to "/admin/projects"
31 31 assert !Project.find(1).active?
Show file before | Show file after | Hide comments
@@ -113,21 +113,21 class SudoModeTest < Redmine::IntegrationTest
113 113 assert_response :success
114 114 assert_select 'h2', 'Confirm your password to continue'
115 115 assert_select 'form[action="/roles"]'
116 assert assigns(:sudo_form).errors.blank?
116 assert_select '#flash_error', 0
117 117
118 118 post '/roles', role: { name: 'new role', issues_visibility: 'all' }
119 119 assert_response :success
120 120 assert_select 'h2', 'Confirm your password to continue'
121 121 assert_select 'form[action="/roles"]'
122 assert_match /"new role"/, response.body
123 assert assigns(:sudo_form).errors.blank?
122 assert_select 'input[type=hidden][name=?][value=?]', 'role[name]', 'new role'
123 assert_select '#flash_error', 0
124 124
125 125 post '/roles', role: { name: 'new role', issues_visibility: 'all' }, sudo_password: 'wrong'
126 126 assert_response :success
127 127 assert_select 'h2', 'Confirm your password to continue'
128 128 assert_select 'form[action="/roles"]'
129 assert_match /"new role"/, response.body
130 assert assigns(:sudo_form).errors[:password].present?
129 assert_select 'input[type=hidden][name=?][value=?]', 'role[name]', 'new role'
130 assert_select '#flash_error'
131 131
132 132 assert_difference 'Role.count' do
133 133 post '/roles', role: { name: 'new role', issues_visibility: 'all', assignable: '1', permissions: %w(view_calendar) }, sudo_password: 'admin'
@@ -144,16 +144,16 class SudoModeTest < Redmine::IntegrationTest
144 144 assert_response :success
145 145 assert_select 'h2', 'Confirm your password to continue'
146 146 assert_select 'form[action="/my/account"]'
147 assert_match /"newmail@test\.com"/, response.body
148 assert assigns(:sudo_form).errors.blank?
147 assert_select 'input[type=hidden][name=?][value=?]', 'user[mail]', 'newmail@test.com'
148 assert_select '#flash_error', 0
149 149
150 150 # wrong password
151 151 post '/my/account', user: { mail: 'newmail@test.com' }, sudo_password: 'wrong'
152 152 assert_response :success
153 153 assert_select 'h2', 'Confirm your password to continue'
154 154 assert_select 'form[action="/my/account"]'
155 assert_match /"newmail@test\.com"/, response.body
156 assert assigns(:sudo_form).errors[:password].present?
155 assert_select 'input[type=hidden][name=?][value=?]', 'user[mail]', 'newmail@test.com'
156 assert_select '#flash_error'
157 157
158 158 # correct password
159 159 post '/my/account', user: { mail: 'newmail@test.com' }, sudo_password: 'jsmith'
Show file before | Show file after | Hide comments
@@ -321,7 +321,7 module Redmine
321 321 get "/login"
322 322 assert_equal nil, session[:user_id]
323 323 assert_response :success
324 assert_template "account/login"
324
325 325 post "/login", :username => login, :password => password
326 326 assert_equal login, User.find(session[:user_id]).login
327 327 end
General Comments 0
You need to be logged in to leave comments. Login now