Merge pull request #12 from github/generic_arguments_test_helper

support generic arguments in the `chatop` test helper

Author: jakedouglas

lib/chatops/controller/test_case_helpers.rb

@@ -22,12 +22,15 @@ def chat(message, user, room_id = "123")
       metadata["regex"] = Regexp.new("^#{metadata["regex"]}$", "i")
       metadata
     }
-    matcher = matchers.find { |matcher| matcher["regex"].match(message) }
 
-    raise NoMatchingCommandRegex.new("No command matches '#{message}'") unless matcher
+    named_params, command = extract_named_params(message)
 
-    match_data = matcher["regex"].match(message)
-    jsonrpc_params = {}
+    matcher = matchers.find { |matcher| matcher["regex"].match(command) }
+
+    raise NoMatchingCommandRegex.new("No command matches '#{command}'") unless matcher
+
+    match_data = matcher["regex"].match(command)
+    jsonrpc_params = named_params.dup
     matcher["params"].each do |param|
       jsonrpc_params[param] = match_data[param.to_sym]
     end
@@ -47,4 +50,18 @@ def chatop_error
     json_response = JSON.load(response.body)
     json_response["error"]["message"]
   end
+
+  def extract_named_params(command_string)
+    params = {}
+
+    while last_index = command_string.rindex(" --")
+      arg = command_string[last_index..-1]
+      matches = arg.match(/ --(\S+)(.*)/)
+      params[matches[1]] = matches[2].strip
+      command_string = command_string.slice(0, last_index)
+    end
+
+    command_string = command_string.strip
+    [params, command_string]
+  end
 end

spec/lib/chatops/controller_spec.rb

@@ -215,6 +215,16 @@ def ensure_app_given
         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["user"]).to eq "bhuga"
+        expect(request.params["params"]["app"]).to eq "foobar"
+        expect(request.params["params"]["fruit"]).to eq "apple"
+        expect(request.params["params"]["vegetable"]).to eq "green celery"
+        expect(chatop_response).to eq "You can deploy foobar just fine."
+      end
+
       it "anchors regexes" do
         expect {
           chat "too bad that this message doesn't start with where can i deploy foobar", "bhuga"