From: Tom Hughes <tom@compton.nu>
Date: Sun, 30 Oct 2016 16:59:20 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1352'
X-Git-Tag: live~3735
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/fc0aebc1a8ccad4ae9a3ac6435df00328e5a98e5?hp=-c

Merge remote-tracking branch 'openstreetmap/pull/1352'
---

fc0aebc1a8ccad4ae9a3ac6435df00328e5a98e5
diff --combined .rubocop_todo.yml
index 83d561ef1,b5834b8ce..f1e93f25b
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@@ -64,7 -64,7 +64,7 @@@ Metrics/BlockNesting
  # Offense count: 62
  # Configuration parameters: CountComments.
  Metrics/ClassLength:
-   Max: 1658
 -  Max: 1653
++  Max: 1659
  
  # Offense count: 69
  Metrics/CyclomaticComplexity:
diff --combined test/controllers/changeset_controller_test.rb
index e77083f2d,5744ed9ab..efdf22e54
--- a/test/controllers/changeset_controller_test.rb
+++ b/test/controllers/changeset_controller_test.rb
@@@ -3,6 -3,7 +3,6 @@@ require "changeset_controller
  
  class ChangesetControllerTest < ActionController::TestCase
    api_fixtures
 -  fixtures :changesets_subscribers
  
    ##
    # test all routes which lead to this controller
@@@ -1648,6 -1649,7 +1648,7 @@@ EO
  
      ## Now try with the public user
      changeset = changesets(:public_user_first_change)
+     create(:changeset_tag, :changeset => changeset)
      new_changeset = changeset.to_xml
      new_tag = XML::Node.new "tag"
      new_tag["k"] = "tagtesting"
@@@ -1985,15 -1987,9 +1986,15 @@@
      end
      assert_response :success
  
 +    changeset = changesets(:normal_user_subscribed_change)
 +    changeset.subscribers.push(users(:normal_user))
 +    changeset.subscribers.push(users(:public_user))
 +    changeset.subscribers.push(users(:suspended_user))
 +    changeset.subscribers.push(users(:deleted_user))
 +
      assert_difference "ChangesetComment.count", 1 do
        assert_difference "ActionMailer::Base.deliveries.size", 1 do
 -        post :comment, :id => changesets(:normal_user_subscribed_change).id, :text => "This is a comment"
 +        post :comment, :id => changeset.id, :text => "This is a comment"
        end
      end
      assert_response :success
@@@ -2009,7 -2005,7 +2010,7 @@@
  
      assert_difference "ChangesetComment.count", 1 do
        assert_difference "ActionMailer::Base.deliveries.size", 2 do
 -        post :comment, :id => changesets(:normal_user_subscribed_change).id, :text => "This is a comment"
 +        post :comment, :id => changeset.id, :text => "This is a comment"
        end
      end
      assert_response :success
@@@ -2100,7 -2096,6 +2101,7 @@@
  
      # trying to subscribe when already subscribed
      changeset = changesets(:normal_user_subscribed_change)
 +    changeset.subscribers.push(users(:public_user))
      assert_no_difference "changeset.subscribers.count" do
        post :subscribe, :id => changeset.id
      end
@@@ -2112,7 -2107,6 +2113,7 @@@
    def test_unsubscribe_success
      basic_authorization(users(:public_user).email, "test")
      changeset = changesets(:normal_user_subscribed_change)
 +    changeset.subscribers.push(users(:public_user))
  
      assert_difference "changeset.subscribers.count", -1 do
        post :unsubscribe, :id => changeset.id