fix testcode

diff --git a/test/selenium/pages/quick_edit.rb b/test/selenium/pages/quick_edit.rb
index 11137f7..b831f19 100644 (file)
--- a/test/selenium/pages/quick_edit.rb
+++ b/test/selenium/pages/quick_edit.rb
@@ -48,7 +48,7 @@ module QuickEdit
           @before_page.class.open @driver, @base_url, @project
         end
 
-        def preview_replace(issue_id, menu_selector, find_value, replace_value, desire_alerting = false)
+        def preview_replace(issue_id, menu_selector, find_value, replace_value, match_case, 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
@@ -57,6 +57,7 @@ module QuickEdit
 
           input_text :id, :find, find_value
           input_text :id, :replace, replace_value
+          click :id, :match_case if match_case
 
           buttons = find_elements(:css, "button > span")
           submit_button = buttons.select {|button| button.text =~ /Preview/}
@@ -76,7 +77,7 @@ module QuickEdit
           end
         end
 
-        def replace(issue_id, menu_selector, find_value, replace_value, desire_alerting = false)
+        def replace(issue_id, menu_selector, find_value, replace_value, match_case, 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
@@ -85,6 +86,7 @@ module QuickEdit
 
           input_text :id, :find, find_value
           input_text :css, "#quick_edit_input_dialog #replace", replace_value
+          click :id, :match_case if match_case
 
           buttons = find_elements(:css, "button > span")
           submit_button = buttons.select {|button| button.text =~ /Submit/}

diff --git a/test/selenium/replace_core_field.rb b/test/selenium/replace_core_field.rb
index 35a4854..921f7a9 100644 (file)
--- a/test/selenium/replace_core_field.rb
+++ b/test/selenium/replace_core_field.rb
@@ -30,7 +30,7 @@ describe "Replace core field" do
 
     # create issue for test
     issue_new_page = @issues_page.open_new_page()
-    issue_show_page = issue_new_page.create(:bug, 'first subject')
+    issue_show_page = issue_new_page.create(:bug, 'initial text')
     @issue_id = issue_show_page.id
 
   end
@@ -48,22 +48,37 @@ describe "Replace core field" do
   end
   
   it "subject can replace" do
-    new_value = 'initial text'
-    expect( edit(@issue_id, :subject, new_value) ).to eq new_value
+    new_value = 'NEW text'
+    find = 'initial'
+    replace = 'NEW'
+    match_case = false
+    expect( replace(@issue_id, :subject, find, replace, match_case) ).to eq new_value
 
+    # match case test: to lower
     new_value = 'new text'
-    find = 'initial'
+    find = 'new'
     replace = 'new'
-    expect( replace(@issue_id, :subject, find, replace) ).to eq new_value
+    match_case = true
+    expect( replace(@issue_id, :subject, find, replace, match_case) ).to eq new_value
 
-    new_value = "new<>\'\"&+% text"
+    # special chars test
+    new_value = "new<>\'\"&\\+ %text"
     find = ' '
-    replace = "<>\'\"&+% "
-    expect( replace(@issue_id, :subject, find, replace) ).to eq new_value
+    replace = "<>\'\"&\\+ %"
+    match_case = false
+    expect( replace(@issue_id, :subject, find, replace, match_case) ).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 = ''
-    expect( replace_with_alert(@issue_id, :subject, find, replace) ).to eq new_value
+    match_case = false
+    expect( replace_with_alert(@issue_id, :subject, find, replace, match_case) ).to eq new_value
   end
 
   def edit(issue_id, attribute_name, new_value)
@@ -81,10 +96,10 @@ describe "Replace core field" do
     end
   end
 
-  def replace(issue_id, attribute_name, find, replace)
+  def replace(issue_id, attribute_name, find, replace, match_case)
     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)
+    @issues_page = quick_edit.replace(issue_id, menu_selector, find, replace, match_case)
 
     attribute_name = :parent if attribute_name.to_sym == :parent_issue_id
     field_value = get_core_field(issue_id, attribute_name)
@@ -96,10 +111,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, find, replace, match_case)
     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, true)
+    quick_edit.replace(issue_id, menu_selector, find, replace, match_case, 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 48a0a9b..7948f1e 100644 (file)
--- a/test/selenium/replace_core_field_on_mypage.rb
+++ b/test/selenium/replace_core_field_on_mypage.rb
@@ -30,7 +30,7 @@ describe "Replace core field" do
 
     # create issue for test
     issue_new_page = @issues_page.open_new_page()
-    issue_show_page = issue_new_page.create(:bug, 'first subject')
+    issue_show_page = issue_new_page.create(:bug, 'initial text')
     @issue_id = issue_show_page.id
 
   end
@@ -48,9 +48,6 @@ describe "Replace core field" do
   end
   
   it "subject can replace" do
-    new_value = 'initial text'
-    expect( edit(@issue_id, :subject, new_value) ).to eq new_value
-
     new_value = 'new text'
     find = 'initial'
     replace = 'new'
@@ -84,7 +81,7 @@ describe "Replace core field" do
   def replace(issue_id, attribute_name, find, replace)
     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)
+    @issues_page = quick_edit.replace(issue_id, menu_selector, find, replace, false)
 
     attribute_name = :parent if attribute_name.to_sym == :parent_issue_id
     field_value = get_core_field(issue_id, attribute_name)
@@ -99,7 +96,7 @@ describe "Replace core field" do
   def replace_with_alert(issue_id, attribute_name, find, replace)
     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, true)
+    quick_edit.replace(issue_id, menu_selector, find, replace, false, true)
     quick_edit.alert.accept
     quick_edit.cancel_quick_edit