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

Merge remote-tracking branch 'upstream/pull/1704'

Browse source
This commit is contained in:
Tom Hughes 2018-02-04 15:09:40 +00:00
commit 673b58f96f
3 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.rubocop_todo.yml
View file

@ -77,7 +77,7 @@ Metrics/BlockNesting:
# Offense count: 63 # Offense count: 63
# Configuration parameters: CountComments. # Configuration parameters: CountComments.
Metrics/ClassLength: Metrics/ClassLength:
Max: 1796 Max: 1797
# Offense count: 71 # Offense count: 71
Metrics/CyclomaticComplexity: Metrics/CyclomaticComplexity:

2
app/controllers/changeset_controller.rb
View file

@ -353,7 +353,6 @@ class ChangesetController < ApplicationController
# Find the changeset and check it is valid # Find the changeset and check it is valid
changeset = Changeset.find(id) changeset = Changeset.find(id)
raise OSM::APIChangesetNotYetClosedError, changeset if changeset.is_open?
raise OSM::APIChangesetAlreadySubscribedError, changeset if changeset.subscribers.exists?(current_user.id) raise OSM::APIChangesetAlreadySubscribedError, changeset if changeset.subscribers.exists?(current_user.id)
# Add the subscriber # Add the subscriber
@ -374,7 +373,6 @@ class ChangesetController < ApplicationController
# Find the changeset and check it is valid # Find the changeset and check it is valid
changeset = Changeset.find(id) changeset = Changeset.find(id)
raise OSM::APIChangesetNotYetClosedError, changeset if changeset.is_open?
raise OSM::APIChangesetNotSubscribedError, changeset unless changeset.subscribers.exists?(current_user.id) raise OSM::APIChangesetNotSubscribedError, changeset unless changeset.subscribers.exists?(current_user.id)
# Remove the subscriber # Remove the subscriber

30
test/controllers/changeset_controller_test.rb
View file

@ -2246,6 +2246,13 @@ CHANGESET
post :subscribe, :params => { :id => changeset.id } post :subscribe, :params => { :id => changeset.id }
end end
assert_response :success assert_response :success
# not closed changeset
changeset = create(:changeset)
assert_difference "changeset.subscribers.count", 1 do
post :subscribe, :params => { :id => changeset.id }
end
assert_response :success
end end
## ##
@ -2268,13 +2275,6 @@ CHANGESET
end end
assert_response :not_found assert_response :not_found
# not closed changeset
changeset = create(:changeset)
assert_no_difference "changeset.subscribers.count" do
post :subscribe, :params => { :id => changeset.id }
end
assert_response :conflict
# trying to subscribe when already subscribed # trying to subscribe when already subscribed
changeset = create(:changeset, :closed) changeset = create(:changeset, :closed)
changeset.subscribers.push(user) changeset.subscribers.push(user)
@ -2296,6 +2296,15 @@ CHANGESET
post :unsubscribe, :params => { :id => changeset.id } post :unsubscribe, :params => { :id => changeset.id }
end end
assert_response :success assert_response :success
# not closed changeset
changeset = create(:changeset)
changeset.subscribers.push(user)
assert_difference "changeset.subscribers.count", -1 do
post :unsubscribe, :params => { :id => changeset.id }
end
assert_response :success
end end
## ##
@ -2316,13 +2325,6 @@ CHANGESET
end end
assert_response :not_found assert_response :not_found
# not closed changeset
changeset = create(:changeset)
assert_no_difference "changeset.subscribers.count" do
post :unsubscribe, :params => { :id => changeset.id }
end
assert_response :conflict
# trying to unsubscribe when not subscribed # trying to unsubscribe when not subscribed
changeset = create(:changeset, :closed) changeset = create(:changeset, :closed)
assert_no_difference "changeset.subscribers.count" do assert_no_difference "changeset.subscribers.count" do