fix setup test for redmine-3.2

diff --git a/test/selenium/pages/custom_field_new.rb b/test/selenium/pages/custom_field_new.rb
index b2f8daf..5f602be 100644 (file)
--- a/test/selenium/pages/custom_field_new.rb
+++ b/test/selenium/pages/custom_field_new.rb
@@ -15,7 +15,7 @@ module QuickEdit
           CustomFieldNewPage.new driver, base_url, project
         end
 
-        def create(name, format)
+        def create(name, format, redmine_version)
           input_text :id, :custom_field_name, name
           select :id, :custom_field_field_format, format
 
@@ -28,7 +28,12 @@ module QuickEdit
           # submit
           click :name, 'commit'
 
-          CustomFieldsPage.new @driver, @base_url, @project
+          if redmine_version <= 301
+            CustomFieldsPage.new @driver, @base_url, @project
+          else
+            CustomFieldEditPage.new @driver, @base_url, @project
+            CustomFieldsPage.open @driver, @base_url, @project
+          end
         end
 
       end

diff --git a/test/selenium/setup.rb b/test/selenium/setup.rb
index f55c10c..1df1c72 100644 (file)
--- a/test/selenium/setup.rb
+++ b/test/selenium/setup.rb
@@ -71,44 +71,44 @@ describe "Setup" do
     id = custom_fields_page.find_field(:custom_text)
     if id.nil?
       new_page = custom_fields_page.open_new_page
-      custom_fields_page = new_page.create :custom_text, :string
+      custom_fields_page = new_page.create :custom_text, :string, @redmine_version
     end
 
     id = custom_fields_page.find_field(:custom_long)
     if id.nil?
       new_page = custom_fields_page.open_new_page
-      custom_fields_page = new_page.create :custom_long, :text
+      custom_fields_page = new_page.create :custom_long, :text, @redmine_version
     end
 
     id = custom_fields_page.find_field(:custom_int)
     if id.nil?
       new_page = custom_fields_page.open_new_page
-      custom_fields_page = new_page.create :custom_int, :int
+      custom_fields_page = new_page.create :custom_int, :int, @redmine_version
     end
 
     id = custom_fields_page.find_field(:custom_float)
     if id.nil?
       new_page = custom_fields_page.open_new_page
-      custom_fields_page = new_page.create :custom_float, :float
+      custom_fields_page = new_page.create :custom_float, :float, @redmine_version
     end
 
     id = custom_fields_page.find_field(:custom_date)
     if id.nil?
       new_page = custom_fields_page.open_new_page
-      custom_fields_page = new_page.create :custom_date, :date
+      custom_fields_page = new_page.create :custom_date, :date, @redmine_version
     end
 
     id = custom_fields_page.find_field(:readonly_in_progress)
     if id.nil?
       new_page = custom_fields_page.open_new_page
-      custom_fields_page = new_page.create :readonly_in_progress, :string
+      custom_fields_page = new_page.create :readonly_in_progress, :string, @redmine_version
     end
 
     if @redmine_version >= 205
       id = custom_fields_page.find_field(:custom_link)
       if id.nil?
         new_page = custom_fields_page.open_new_page
-        custom_fields_page = new_page.create :custom_link, :link
+        custom_fields_page = new_page.create :custom_link, :link, @redmine_version
       end
     end
   end