spec/plugin/param_matchers_spec.rb in roda-2.5.1 vs spec/plugin/param_matchers_spec.rb in roda-2.6.0

@@ -5,33 +5,65 @@
     app(:param_matchers) do |r|
       r.get "signup", :param! => "email" do |email|
         email
       end
 
-      r.on do
-        "No email"
-      end
+      "No email"
     end
 
     io = StringIO.new
     body("/signup", "rack.input" => io, "QUERY_STRING" => "email=[e-mail]").must_equal '[e-mail]'
     body("/signup", "rack.input" => io, "QUERY_STRING" => "").must_equal 'No email'
     body("/signup", "rack.input" => io, "QUERY_STRING" => "email=").must_equal 'No email'
   end
 
-  it "param matcheshould yield a param only if given" do
+  it "param matcher should yield a param only if given" do
     app(:param_matchers) do |r|
       r.get "signup", :param=>"email" do |email|
         email
       end
 
-      r.on do
-        "No email"
-      end
+      "No email"
     end
 
     io = StringIO.new
     body("/signup", "rack.input" => io, "QUERY_STRING" => "email=[e-mail]").must_equal '[e-mail]'
     body("/signup", "rack.input" => io, "QUERY_STRING" => "").must_equal 'No email'
     body("/signup", "rack.input" => io, "QUERY_STRING" => "email=").must_equal ''
+  end
+
+  it "params! matcher should yield the params only if all are given and not empty" do
+    app(:param_matchers) do |r|
+      r.get "signup", :params! => %w"em ail" do |em, ail|
+        em + ail
+      end
+
+      "No email"
+    end
+
+    io = StringIO.new
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "em=foo&ail=[e-mail]").must_equal '[e-mail]'
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "em=&ail=[e-mail]").must_equal 'No email'
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "em=foo&ail=").must_equal 'No email'
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "em=&ail=").must_equal 'No email'
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "em=foo").must_equal 'No email'
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "ail=[e-mail]").must_equal 'No email'
+  end
+
+  it "params matcher should yield the params only if all are given" do
+    app(:param_matchers) do |r|
+      r.get "signup", :params=>%w"em ail" do |em, ail|
+        em + ail
+      end
+
+      "No email"
+    end
+
+    io = StringIO.new
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "em=foo&ail=[e-mail]").must_equal '[e-mail]'
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "em=&ail=[e-mail]").must_equal '[e-mail]'
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "em=foo&ail=").must_equal 'foo'
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "em=&ail=").must_equal ''
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "em=foo").must_equal 'No email'
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "ail=[e-mail]").must_equal 'No email'
   end
 end