From 7b231b9a6b1065c2eb5bb713f4f611826df914b2 Mon Sep 17 00:00:00 2001
From: Kanezoh <asfaltmanta114@gmail.com>
Date: Fri, 18 Jun 2021 20:59:10 +0900
Subject: [PATCH] refactor checkbox

---
 spec/form_spec.cr     | 22 +++++++++++++++++++++-
 src/mechanize/form.cr |  3 +--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/spec/form_spec.cr b/spec/form_spec.cr
index caaaad3..15c2b8a 100644
--- a/spec/form_spec.cr
+++ b/spec/form_spec.cr
@@ -26,7 +26,7 @@ describe "Mechanize Form test" do
   page = agent.get(uri)
   form = page.forms.first
 
-  it "retrun form attribute" do
+  it "returns form attribute" do
     form.action.should eq "post_path"
     form.method.should eq "POST"
     form.enctype.should eq "application/x-www-form-urlencoded"
@@ -47,9 +47,11 @@ describe "Mechanize Form test" do
 
   context "Form Fields CheckBox" do
     checkbox = form.checkboxes.first
+
     it "returns checkbox status" do
       checkbox.checked?.should eq true
     end
+
     it "can change check status" do
       checkbox.checked?.should eq true
       checkbox.uncheck
@@ -62,6 +64,7 @@ describe "Mechanize Form test" do
       checkbox.click
       checkbox.checked?.should eq true
     end
+
     it "doesn't included in request data if checkbox isn't checked" do
       form.request_data.should contain("remember_me=on")
       checkbox.uncheck
@@ -72,9 +75,11 @@ describe "Mechanize Form test" do
   context "Form Fields RadioButton" do
     radiobuttons = form.radiobuttons
     radiobuttons.size.should eq 3
+
     it "returns radiobutton check status" do
       radiobuttons.map(&.checked?).should eq [false,false,false]  
     end
+
     it "can change check status" do
       radiobutton = radiobuttons.first
       radiobutton.checked?.should eq false
@@ -88,6 +93,7 @@ describe "Mechanize Form test" do
       radiobutton.click
       radiobutton.checked?.should eq false
     end
+
     it "check status is exclusive" do
       radiobuttons[0].check
       radiobuttons[0].checked.should eq true
@@ -96,11 +102,25 @@ describe "Mechanize Form test" do
       radiobuttons[1].checked.should eq true
       radiobuttons[0].checked.should eq false
     end
+
     it "doesn't included in request data if checkbox isn't checked" do
       radiobuttons[0].check
       form.request_data.should contain "contact=email"
       radiobuttons[0].uncheck
       form.request_data.should_not contain "contact"
     end
+
+    it "can be found by radiobutton_with method" do
+      radiobutton = form.radiobutton_with("contact")
+      radiobutton.value.should eq "email"
+    end
+
+    it "can be found by radiobuttons_with method" do
+      radiobuttons = form.radiobuttons_with("contact")
+      radiobuttons.size.should eq 3
+      radiobuttons[0].value.should eq "email"
+      radiobuttons[1].value.should eq "phone"
+      radiobuttons[2].value.should eq "mail"
+    end
   end
 end
diff --git a/src/mechanize/form.cr b/src/mechanize/form.cr
index 9f329fb..ea9378d 100644
--- a/src/mechanize/form.cr
+++ b/src/mechanize/form.cr
@@ -62,14 +62,13 @@ class MechanizeCr::Form
           v === elm.name
         end
       end
-      return nil if f.empty?
       yield f
       f
     end
 
     def {{singular.id}}_with(criteria)
       f = {{plural.id}}_with(criteria)
-      raise ElementNotFoundError.new(:{{singular.id}}, criteria) if f.nil?
+      raise ElementNotFoundError.new(:{{singular.id}}, criteria) if f.empty?
       f.first
     end
   {% end %}