Merge pull request #5221 from consuldemocracy/dependabot/bundler/rubocop-rails-2.20.2

Bump rubocop-rails from 2.15.2 to 2.20.2

.rubocop.yml

@@ -313,6 +313,9 @@ Performance/StringIdentifierArgument:
 Performance/Sum:
   Enabled: true
 
+Rails/ActionControllerFlashBeforeRender:
+  Enabled: true
+
 Rails/ActiveRecordCallbacksOrder:
   Enabled: true
 
@@ -405,6 +408,9 @@ Rails/RelativeDateConstant:
 Rails/RequestReferer:
   Enabled: true
 
+Rails/ResponseParsedBody:
+  Enabled: true
+
 Rails/ReversibleMigration:
   Enabled: true
 
@@ -452,6 +458,9 @@ Rails/WhereEquals:
 Rails/WhereNot:
   Enabled: true
 
+Rails/WhereNotWithMultipleConditions:
+  Enabled: true
+
 RSpec/AroundBlock:
   Enabled: true
 

Gemfile

@@ -108,7 +108,7 @@ group :development do
   gem "pronto-scss", "~> 0.11.0", require: false
   gem "rubocop", "~> 1.35.1", require: false
   gem "rubocop-performance", "~> 1.19.0", require: false
-  gem "rubocop-rails", "~> 2.15.2", require: false
+  gem "rubocop-rails", "~> 2.20.2", require: false
   gem "rubocop-rspec", "~> 2.4.0", require: false
   gem "rvm1-capistrano3", "~> 1.4.0", require: false
   gem "scss_lint", "~> 0.60.0", require: false

Gemfile.lock

@@ -528,10 +528,10 @@ GEM
     rubocop-performance (1.19.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.15.2)
+    rubocop-rails (2.20.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.7.0, < 2.0)
+      rubocop (>= 1.33.0, < 2.0)
     rubocop-rspec (2.4.0)
       rubocop (~> 1.0)
       rubocop-ast (>= 1.1.0)
@@ -745,7 +745,7 @@ DEPENDENCIES
   rspec-rails (~> 5.1.2)
   rubocop (~> 1.35.1)
   rubocop-performance (~> 1.19.0)
-  rubocop-rails (~> 2.15.2)
+  rubocop-rails (~> 2.20.2)
   rubocop-rspec (~> 2.4.0)
   rvm1-capistrano3 (~> 1.4.0)
   sassc-rails (~> 2.1.2)

app/helpers/officing_helper.rb

@@ -4,7 +4,7 @@ module OfficingHelper
     officer_assignments.each do |oa|
       options << [oa.booth_assignment.booth.name.to_s, oa.id]
     end
-    options.sort! { |x, y| x[0] <=> y[0] }
+    options.sort_by! { |x| x[0] }
     options_for_select(options, params[:oa])
   end
 

spec/controllers/admin/api/stats_controller_spec.rb

@@ -29,9 +29,7 @@ describe Admin::Api::StatsController, :admin do
         get :show, params: { event: "foo" }
 
         expect(response).to be_ok
-
-        data = JSON.parse(response.body)
-        expect(data).to eq "x" => ["2015-01-01", "2015-01-02"], "Foo" => [2, 1]
+        expect(response.parsed_body).to eq "x" => ["2015-01-01", "2015-01-02"], "Foo" => [2, 1]
       end
     end
 
@@ -47,9 +45,7 @@ describe Admin::Api::StatsController, :admin do
         get :show, params: { visits: true }
 
         expect(response).to be_ok
-
-        data = JSON.parse(response.body)
-        expect(data).to eq "x" => ["2015-01-01", "2015-01-02"], "Visits" => [2, 1]
+        expect(response.parsed_body).to eq "x" => ["2015-01-01", "2015-01-02"], "Visits" => [2, 1]
       end
     end
 
@@ -65,9 +61,7 @@ describe Admin::Api::StatsController, :admin do
         get :show, params: { budget_investments: true }
 
         expect(response).to be_ok
-
-        data = JSON.parse(response.body)
-        expect(data).to eq "x" => ["2017-04-01", "2017-04-02"], "Budget Investments" => [1, 2]
+        expect(response.parsed_body).to eq "x" => ["2017-04-01", "2017-04-02"], "Budget Investments" => [1, 2]
       end
     end
   end

spec/controllers/graphql_controller_spec.rb

@@ -16,7 +16,7 @@ describe GraphqlController, type: :request do
       get "/graphql", params: { query: "{ proposal(id: #{proposal.id}) { title } }" }
 
       expect(response).to have_http_status(:ok)
-      expect(JSON.parse(response.body)["data"]["proposal"]["title"]).to eq(proposal.title)
+      expect(response.parsed_body["data"]["proposal"]["title"]).to eq(proposal.title)
     end
 
     specify "with malformed query string" do
@@ -30,7 +30,7 @@ describe GraphqlController, type: :request do
       get "/graphql"
 
       expect(response).to have_http_status(:bad_request)
-      expect(JSON.parse(response.body)["message"]).to eq("Query string not present")
+      expect(response.parsed_body["message"]).to eq("Query string not present")
     end
   end
 
@@ -42,7 +42,7 @@ describe GraphqlController, type: :request do
                        headers: json_headers
 
       expect(response).to have_http_status(:ok)
-      expect(JSON.parse(response.body)["data"]["proposal"]["title"]).to eq(proposal.title)
+      expect(response.parsed_body["data"]["proposal"]["title"]).to eq(proposal.title)
     end
 
     specify "with raw query string inside body" do
@@ -51,7 +51,7 @@ describe GraphqlController, type: :request do
                        headers: graphql_headers
 
       expect(response).to have_http_status(:ok)
-      expect(JSON.parse(response.body)["data"]["proposal"]["title"]).to eq(proposal.title)
+      expect(response.parsed_body["data"]["proposal"]["title"]).to eq(proposal.title)
     end
 
     specify "with malformed query string" do
@@ -65,7 +65,7 @@ describe GraphqlController, type: :request do
       post "/graphql", headers: json_headers
 
       expect(response).to have_http_status(:bad_request)
-      expect(JSON.parse(response.body)["message"]).to eq("Query string not present")
+      expect(response.parsed_body["message"]).to eq("Query string not present")
     end
   end
 

spec/controllers/installation_controller_spec.rb

@@ -22,8 +22,8 @@ describe InstallationController, type: :request do
       get "/consul.json"
 
       expect(response).to have_http_status(:ok)
-      expect(JSON.parse(response.body)["release"]).not_to be_empty
-      expect(JSON.parse(response.body)["features"]).to eq(test_process_settings)
+      expect(response.parsed_body["release"]).not_to be_empty
+      expect(response.parsed_body["features"]).to eq(test_process_settings)
     end
   end
 end