cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename association to reported_user, for clarity

Browse source
This commit is contained in:
Andy Allan 2017-07-12 11:44:05 +01:00
parent 6f375ef493
commit 99df5f6179
5 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/controllers/issues_controller_test.rb
View file

@ -162,7 +162,7 @@ class IssuesControllerTest < ActionController::TestCase
def test_change_status_by_normal_user
target_user = create(:user)
issue = create(:issue, :reportable => target_user, :reported_user_id => target_user.id)
issue = create(:issue, :reportable => target_user, :reported_user => target_user)
# Login as normal user
session[:user] = create(:user).id
@ -177,7 +177,7 @@ class IssuesControllerTest < ActionController::TestCase
def test_change_status_by_admin
target_user = create(:user)
issue = create(:issue, :reportable => target_user, :reported_user_id => target_user.id)
issue = create(:issue, :reportable => target_user, :reported_user => target_user)
# Login as administrator
session[:user] = create(:administrator_user).id
@ -201,7 +201,7 @@ class IssuesControllerTest < ActionController::TestCase
def test_search_issues
good_user = create(:user)
bad_user = create(:user)
create(:issue, :reportable => bad_user, :reported_user_id => bad_user.id, :issue_type => "administrator")
create(:issue, :reportable => bad_user, :reported_user => bad_user, :issue_type => "administrator")
# Login as administrator
session[:user] = create(:administrator_user).id

4
test/factories/issues.rb
View file

@ -2,8 +2,6 @@ FactoryGirl.define do
factory :issue do
# Default to reporting users
association :reportable, :factory => :user
# reported_user_id
association :user, :factory => :user
association :reported_user, :factory => :user
end
end