refactor test code

diff --git a/test/selenium/pages/quick_edit.rb b/test/selenium/pages/quick_edit.rb
index 2b492a0..3b59a30 100644 (file)
--- a/test/selenium/pages/quick_edit.rb
+++ b/test/selenium/pages/quick_edit.rb
@@ -83,24 +83,20 @@ module QuickEdit
           end
         end
 
-        def replace(issue_id, menu_selector, find_value, replace_value, match_case, desire_alerting = false)
+        def replace(issue_id, menu_selector, params, desire_alerting = false)
           menu_element = find_element(:id, "quick_edit_context")
           menu_item_element = find_element(:css, menu_selector)
           action.move_to(menu_element).click(menu_item_element).perform
 
           click :id, :replace_switcher
 
-          if find_value.is_a?(Hash)
-            input_text :id, :find, find_value[:find]
-            input_text :css, "#quick_edit_input_dialog #replace", find_value[:replace]
-            click :id, :match_case if find_value[:match_case]
+          input_text :id, :find, params[:find]
+          input_text :css, "#quick_edit_input_dialog #replace", params[:replace]
+          click :id, :match_case if params[:match_case]
 
-            input_text :id, "notes_for_replace", find_value[:notes][:text] unless find_value[:notes].nil?
-            click :id, "issue_private_notes_for_replace" if find_value[:notes][:is_private]
-          else
-            input_text :id, :find, find_value
-            input_text :css, "#quick_edit_input_dialog #replace", replace_value
-            click :id, :match_case if match_case
+          if params[:notes].is_a?(Hash)
+            input_text :id, "notes_for_replace", params[:notes][:text] unless params[:notes].nil?
+            click :id, "issue_private_notes_for_replace" if params[:notes][:is_private]
           end
 
           buttons = find_elements(:css, "button > span")

diff --git a/test/selenium/replace_core_field.rb b/test/selenium/replace_core_field.rb
index 81a6fd9..950e3f9 100644 (file)
--- a/test/selenium/replace_core_field.rb
+++ b/test/selenium/replace_core_field.rb
@@ -50,36 +50,46 @@ describe "Replace core field" do
   
   it "subject can replace" do
     new_value = 'NEW text'
-    find = 'initial'
-    replace = 'NEW'
-    match_case = false
-    expect( replace(@issue_id, :subject, find, replace, match_case) ).to eq new_value
+    params = {
+      :find => 'initial',
+      :replace => 'NEW',
+      :match_case => false
+    }
+    expect( replace(@issue_id, :subject, params) ).to eq new_value
 
     # match case test: to lower
     new_value = 'new text'
-    find = 'new'
-    replace = 'new'
-    match_case = true
-    expect( replace(@issue_id, :subject, find, replace, match_case) ).to eq new_value
+    params = {
+      :find => 'new',
+      :replace => 'new',
+      :match_case => true
+    }
+    expect( replace(@issue_id, :subject, params) ).to eq new_value
 
     # special chars test
     new_value = "new<>\'\"&\\+ %text"
-    find = ' '
-    replace = "<>\'\"&\\+ %"
-    match_case = false
-    expect( replace(@issue_id, :subject, find, replace, match_case) ).to eq new_value
+    params = {
+      :find => ' ',
+      :replace => "<>\'\"&\\+ %",
+      :match_case => false
+    }
+    expect( replace(@issue_id, :subject, params) ).to eq new_value
 
     # escape test for meta character of regexp pattern
     new_value = "new<>\'\"&\\++ %text"
-    find = '\\'
-    replace = "\\+"
-    match_case = false
-    expect( replace(@issue_id, :subject, find, replace, match_case) ).to eq new_value
-
-    find = ''
-    replace = ''
-    match_case = false
-    expect( replace_with_alert(@issue_id, :subject, find, replace, match_case) ).to eq new_value
+    params = {
+      :find => '\\',
+      :replace => "\\+",
+      :match_case => false
+    }
+    expect( replace(@issue_id, :subject, params) ).to eq new_value
+
+    params = {
+      :find => '',
+      :replace => '',
+      :match_case => false
+    }
+    expect( replace_with_alert(@issue_id, :subject, params) ).to eq new_value
   end
 
   it "subject can replace with private note" do
@@ -90,11 +100,11 @@ describe "Replace core field" do
     # find & replace
     new_value = {:value => 'summy',
                  :notes => {:text => "notes\ntime=" + (Time.now.to_s), :is_private => true}}
-    param = {:find => 'd',
+    params = {:find => 'd',
              :replace => 's',
              :match_case => false,
              :notes => new_value[:notes]}
-    expect( replace(@issue_id, :subject, param) ).to eq new_value[:value]
+    expect( replace(@issue_id, :subject, params) ).to eq new_value[:value]
     expect( latest_note(@issue_id, @issues_page.session_cookie) ).to eq new_value
   end
 
@@ -113,10 +123,10 @@ describe "Replace core field" do
     end
   end
 
-  def replace(issue_id, attribute_name, find, replace=nil, match_case=nil)
+  def replace(issue_id, attribute_name, params)
     quick_edit = @issues_page.open_context(issue_id)
     menu_selector = quick_edit.menu_selector(attribute_name)
-    @issues_page = quick_edit.replace(issue_id, menu_selector, find, replace, match_case)
+    @issues_page = quick_edit.replace(issue_id, menu_selector, params)
 
     attribute_name = :parent if attribute_name.to_sym == :parent_issue_id
     field_value = get_core_field(issue_id, attribute_name)
@@ -128,10 +138,10 @@ describe "Replace core field" do
     end
   end
 
-  def replace_with_alert(issue_id, attribute_name, find, replace, match_case)
+  def replace_with_alert(issue_id, attribute_name, params)
     quick_edit = @issues_page.open_context(issue_id)
     menu_selector = quick_edit.menu_selector(attribute_name)
-    quick_edit.replace(issue_id, menu_selector, find, replace, match_case, true)
+    quick_edit.replace(issue_id, menu_selector, params, true)
     quick_edit.alert.accept
     quick_edit.cancel_quick_edit
 

diff --git a/test/selenium/replace_core_field_on_mypage.rb b/test/selenium/replace_core_field_on_mypage.rb
index 191f856..6543be9 100644 (file)
--- a/test/selenium/replace_core_field_on_mypage.rb
+++ b/test/selenium/replace_core_field_on_mypage.rb
@@ -50,18 +50,24 @@ describe "Replace core field" do
   
   it "subject can replace" do
     new_value = 'new text'
-    find = 'initial'
-    replace = 'new'
-    expect( replace(@issue_id, :subject, find, replace) ).to eq new_value
+    params = {
+      :find => 'initial',
+      :replace => 'new'
+    }
+    expect( replace(@issue_id, :subject, params) ).to eq new_value
 
     new_value = "new<>\'\"&+% text"
-    find = ' '
-    replace = "<>\'\"&+% "
-    expect( replace(@issue_id, :subject, find, replace) ).to eq new_value
-
-    find = ''
-    replace = ''
-    expect( replace_with_alert(@issue_id, :subject, find, replace) ).to eq new_value
+    params = {
+      :find => ' ',
+      :replace => "<>\'\"&+% "
+    }
+    expect( replace(@issue_id, :subject, params) ).to eq new_value
+
+    params = {
+      :find => '',
+      :replace => ''
+    }
+    expect( replace_with_alert(@issue_id, :subject, params) ).to eq new_value
   end
 
   it "subject can replace with private note" do
@@ -95,10 +101,10 @@ describe "Replace core field" do
     end
   end
 
-  def replace(issue_id, attribute_name, find, replace=nil)
+  def replace(issue_id, attribute_name, params)
     quick_edit = @issues_page.open_context(issue_id)
     menu_selector = quick_edit.menu_selector(attribute_name)
-    @issues_page = quick_edit.replace(issue_id, menu_selector, find, replace, false)
+    @issues_page = quick_edit.replace(issue_id, menu_selector, params, false)
 
     attribute_name = :parent if attribute_name.to_sym == :parent_issue_id
     field_value = get_core_field(issue_id, attribute_name)
@@ -110,10 +116,10 @@ describe "Replace core field" do
     end
   end
 
-  def replace_with_alert(issue_id, attribute_name, find, replace)
+  def replace_with_alert(issue_id, attribute_name, params)
     quick_edit = @issues_page.open_context(issue_id)
     menu_selector = quick_edit.menu_selector(attribute_name)
-    quick_edit.replace(issue_id, menu_selector, find, replace, false, true)
+    quick_edit.replace(issue_id, menu_selector, params, true)
     quick_edit.alert.accept
     quick_edit.cancel_quick_edit