make everything much worse due to rails 5.1 deprecations

Author: Ben Lavender

lib/chatops/controller.rb

@@ -24,11 +24,24 @@ def process(*args)
 
       scrubbed_params.each { |k, v| params[k] = v }
 
-      super
+      if params[:chatop].present?
+        params[:action] = params[:chatop]
+        args[0] = params[:action]
+        unless self.respond_to?(params[:chatop].to_sym)
+          raise AbstractController::ActionNotFound
+        end
+      end
+
+      super *args
     rescue AbstractController::ActionNotFound
       return jsonrpc_method_not_found
     end
 
+    def execute_chatop
+      # This needs to exist for route declarations, but we'll be overriding
+      # things in #process to make a method the action.
+    end
+
     protected
 
     def jsonrpc_params

lib/chatops/controller/test_case_helpers.rb

@@ -12,16 +12,16 @@ def chatop(method, params = {})
     room_id = args.delete :room_id
 
     params = {
-      :method => method,
       :params => args,
       :room_id => room_id,
-      :user => user,
+      :user => user
     }
 
     if Rails.version.slice(0).to_i >= 5
-      params = { params: params }
+      post :execute_chatop, params: params.merge(chatop: method)
+    else
+      post :execute_chatop, params.merge(chatop: method)
     end
-    post method, params
   end
 
   def chat(message, user, room_id = "123")

spec/lib/chatops/controller_spec.rb

@@ -40,7 +40,7 @@ def ensure_app_given
   before :each do
     routes.draw do
       get  "/_chatops" => "anonymous#list"
-      post  "/_chatops/:action", controller: "anonymous"
+      post  "/_chatops/:chatop", controller: "anonymous", action: :execute_chatop
       get  "/other" => "anonymous#non_chatop_method"
       get  "/other_will_fail" => "anonymous#unexcluded_chatop_method"
     end
@@ -121,7 +121,7 @@ def rails_flexible_post(path, outer_params, jsonrpc_params = nil)
     end
 
     it "requires a user be sent to chatops" do
-      post :foobar
+      rails_flexible_post :execute_chatop, chatop: :foobar
       expect(response.status).to eq 400
       expect(json_response).to eq({
         "jsonrpc" => "2.0",
@@ -134,7 +134,7 @@ def rails_flexible_post(path, outer_params, jsonrpc_params = nil)
     end
 
     it "returns method not found for a not found method" do
-      rails_flexible_post :barfoo, :user => "foo"
+      rails_flexible_post :execute_chatop, chatop: :barfoo, user: "foo"
       expect(json_response).to eq({
         "jsonrpc" => "2.0",
         "id" => nil,
@@ -160,7 +160,7 @@ def rails_flexible_post(path, outer_params, jsonrpc_params = nil)
     end
 
     it "runs a known method" do
-      rails_flexible_post :foobar, :user => "foo"
+      rails_flexible_post :execute_chatop, chatop: :foobar, user: "foo"
       expect(json_response).to eq({
         "jsonrpc" => "2.0",
         "id" => nil,
@@ -170,7 +170,7 @@ def rails_flexible_post(path, outer_params, jsonrpc_params = nil)
     end
 
     it "passes parameters to methods" do
-      rails_flexible_post :wcid, { :user => "foo" }, { "app" => "foo" }
+      rails_flexible_post :execute_chatop, { :chatop => "wcid", :user => "foo" }, { "app" => "foo" }
       expect(json_response).to eq({
         "jsonrpc" => "2.0",
         "id" => nil,
@@ -180,7 +180,7 @@ def rails_flexible_post(path, outer_params, jsonrpc_params = nil)
     end
 
     it "uses typical controller fun like before_action" do
-      rails_flexible_post :wcid, :user => "foo"
+      rails_flexible_post :execute_chatop, :chatop => "wcid", :user => "foo"
       expect(json_response).to eq({
         "jsonrpc" => "2.0",
         "id" => nil,
@@ -193,7 +193,7 @@ def rails_flexible_post(path, outer_params, jsonrpc_params = nil)
     end
 
     it "allows methods to return invalid params with a message" do
-      rails_flexible_post :wcid, { :user => "foo" }, { "app" => "nope" }
+      rails_flexible_post :execute_chatop, { :chatop => "wcid", :user => "foo" }, { "app" => "nope" }
       expect(response.status).to eq 400
       expect(json_response).to eq({
         "jsonrpc" => "2.0",
@@ -220,15 +220,17 @@ def rails_flexible_post(path, outer_params, jsonrpc_params = nil)
     context "regex-based test helpers" do
       it "routes based on regexes from test helpers" do
         chat "where can i deploy foobar", "bhuga"
-        expect(request.params["action"]).to eq "wcid"
+        expect(request.params["action"]).to eq "execute_chatop"
+        expect(request.params["chatop"]).to eq "wcid"
         expect(request.params["user"]).to eq "bhuga"
         expect(request.params["params"]["app"]).to eq "foobar"
         expect(chatop_response).to eq "You can deploy foobar just fine."
       end
 
       it "works with generic arguments" do
         chat "where can i deploy foobar --fruit apple --vegetable green celery", "bhuga"
-        expect(request.params["action"]).to eq "wcid"
+        expect(request.params["action"]).to eq "execute_chatop"
+        expect(request.params["chatop"]).to eq "wcid"
         expect(request.params["user"]).to eq "bhuga"
         expect(request.params["params"]["app"]).to eq "foobar"
         expect(request.params["params"]["fruit"]).to eq "apple"
@@ -238,7 +240,8 @@ def rails_flexible_post(path, outer_params, jsonrpc_params = nil)
 
       it "works with boolean arguments" do
         chat "where can i deploy foobar --this-is-sparta", "bhuga"
-        expect(request.params["action"]).to eq "wcid"
+        expect(request.params["action"]).to eq "execute_chatop"
+        expect(request.params["chatop"]).to eq "wcid"
         expect(request.params["user"]).to eq "bhuga"
         expect(request.params["params"]["this-is-sparta"]).to eq "true"
       end