A bunch of commits to keep this plugin compatible with Redmine 4.x

app/controllers/impasse_custom_fields_controller.rb

@@ -7,7 +7,7 @@ class ImpasseCustomFieldsController < ImpasseAbstractController
   before_filter :require_admin
 
   def index
-    @custom_fields_by_type = CustomField.find(:all).group_by {|f| f.class.name }
+    @custom_fields_by_type = CustomField.all.group_by {|f| f.class.name }
     @tab = params[:tab] || 'Impasse::TestCaseCustomField'
   end
 
@@ -19,23 +19,23 @@ def new
     rescue
     end
     (redirect_to(:action => 'index'); return) unless @custom_field.is_a?(CustomField)
-    if request.post? and @custom_field.save
+    if (request.post? or request.patch?) and @custom_field.save
       flash[:notice] = l(:notice_successful_create)
       call_hook(:controller_custom_fields_new_after_save, :params => params, :custom_field => @custom_field)
       redirect_to :action => 'index', :tab => @custom_field.class.name
     else
-      @trackers = Tracker.find(:all, :order => 'position')
+      @trackers = Tracker.all.order(:position)
     end
   end
 
   def edit
     @custom_field = CustomField.find(params[:id])
-    if (request.post? || request.put?) and @custom_field.update_attributes(params[:custom_field])
+    if (request.post? || request.put? or request.patch?) and @custom_field.update_attributes(params[:custom_field])
       flash[:notice] = l(:notice_successful_update)
       call_hook(:controller_custom_fields_edit_after_save, :params => params, :custom_field => @custom_field)
       redirect_to :action => 'index', :tab => @custom_field.class.name
     else
-      @trackers = Tracker.find(:all, :order => 'position')
+      @trackers = Tracker.all.order(:position)
     end
   end
 

app/controllers/impasse_execution_bugs_controller.rb

@@ -3,7 +3,6 @@ class ImpasseExecutionBugsController < ImpasseAbstractController
 
   menu_item :impasse
   before_filter :find_project_by_project_id, :only => [:new, :create]
-  before_filter :check_for_default_issue_status, :only => [:new, :create]
   before_filter :build_new_issue_from_params, :only => [:new, :create]
 
   helper :journals
@@ -23,10 +22,11 @@ class ImpasseExecutionBugsController < ImpasseAbstractController
   include RepositoriesHelper
   helper :sort
   include SortHelper
+  helper :issues
   include IssuesHelper
 
   def new
-    setting = Impasse::Setting.find_or_create_by_project_id(@project)
+    setting = Impasse::Setting.find_or_initialize_by(:project_id => @project)
     @issue.tracker_id = setting.bug_tracker_id unless setting.bug_tracker_id.nil?
 
     respond_to do |format|
@@ -70,7 +70,11 @@ def build_new_issue_from_params
       @issue = @project.issues.visible.find(params[:id])
     end
     @issue.project = @project    # Tracker must be set before custom field values
-    @issue.tracker ||= @project.trackers.find((params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id] || :first)
+    if (params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id]
+      @issue.tracker ||= @project.trackers.find((params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id])
+    else
+      @issue.tracker ||= @project.trackers.first
+    end
     if @issue.tracker.nil?
       render_error l(:error_no_tracker_in_project)
       return false
@@ -86,10 +90,4 @@ def build_new_issue_from_params
     @available_watchers = (@issue.project.users.sort + @issue.watcher_users).uniq
   end
 
-  def check_for_default_issue_status
-    if IssueStatus.default.nil?
-      render_error l(:error_no_default_issue_status)
-      return false
-    end
-  end
 end

app/controllers/impasse_executions_controller.rb

@@ -28,13 +28,11 @@ def put
     status = 'success'
     errors = []
     for test_case_id in test_case_ids
-      test_plan_case = Impasse::TestPlanCase.find(:first, :conditions=>[
-                                                                        "test_plan_id=? AND test_case_id=?",
-                                                                        params[:test_plan_case][:test_plan_id],
-                                                                        test_case_id])
+      test_plan_case = Impasse::TestPlanCase.where("test_plan_id=? AND test_case_id=?",params[:test_plan_case][:test_plan_id],
+                                                                        test_case_id).first
       next if test_plan_case.nil?
-      execution = Impasse::Execution.find_or_initialize_by_test_plan_case_id(test_plan_case.id)
-      execution.attributes = params[:execution]
+      execution = Impasse::Execution.find_or_initialize_by(:test_plan_case_id => test_plan_case.id)
+      execution.update_attributes(params[:execution])
       if params[:record]
         execution.execution_ts = Time.now.to_datetime
         execution.executor_id = User.current.id
@@ -66,10 +64,10 @@ def destroy
 
     status = true
     for test_case_id in test_case_ids
-      test_plan_case = Impasse::TestPlanCase.find(:first, :conditions=>[
-                         "test_plan_id=? AND test_case_id=?", params[:test_plan_case][:test_plan_id], test_case_id])
+      test_plan_case = Impasse::TestPlanCase.where(
+                         "test_plan_id=? AND test_case_id=?", params[:test_plan_case][:test_plan_id], test_case_id).first
       next if test_plan_case.nil?
-      execution = Impasse::Execution.find_by_test_plan_case_id(test_plan_case.id)
+      execution = Impasse::Execution.find_by(:test_plan_case_id => test_plan_case.id)
       next if execution.nil?
       execution.tester_id = execution.expected_date = nil
       satus &= execution.save
@@ -98,16 +96,14 @@ def edit
     executions = Impasse::Execution.find_by_sql [sql, params[:test_plan_case][:test_plan_id], params[:test_plan_case][:test_case_id]]
     if executions.size == 0
       @execution = Impasse::Execution.new
-      @execution.test_plan_case = Impasse::TestPlanCase.find_by_test_plan_id_and_test_case_id(
-        params[:test_plan_case][:test_plan_id], params[:test_plan_case][:test_case_id])
+      @execution.test_plan_case = Impasse::TestPlanCase.find_by(
+        :test_plan_id => params[:test_plan_case][:test_plan_id], :test_case_id => params[:test_plan_case][:test_case_id])
     else
       @execution = executions.first
     end
-    @execution.attributes = params[:execution]
-    @execution_histories = Impasse::ExecutionHistory.find(:all, :joins => [ :executor ],
-                                                          :conditions => ["test_plan_case_id=?", @execution.test_plan_case_id],
-                                                          :order => "execution_ts DESC")
-    if request.post? and @execution.save
+    @execution.update_attributes(params[:execution]) if params[:execution].present?
+    @execution_histories = Impasse::ExecutionHistory.where(:test_plan_case_id => @execution.test_plan_case_id).joins(:executor).order("execution_ts DESC")
+    if (request.post? or request.patch?) and @execution.save
       render :json => {'status'=>true}
     else
       render :partial=>'edit'

app/controllers/impasse_requirement_issues_controller.rb

@@ -9,7 +9,7 @@ class ImpasseRequirementIssuesController < ImpasseAbstractController
 
   def index
     @project = Project.find(params[:project_id])
-    setting = Impasse::Setting.find_by_project_id(@project.id)
+    setting = Impasse::Setting.find_by(:project_id => @project.id)
     params[:set_filter] = true
     params[:fields] ||= []
     params[:fields] << 'tracker_id'
@@ -42,7 +42,7 @@ def index
 
   def add_test_case
     ActiveRecord::Base.transaction do
-      requirement_issue = Impasse::RequirementIssue.find_by_issue_id(params[:issue_id]) || Impasse::RequirementIssue.create(:issue_id => params[:issue_id])
+      requirement_issue = Impasse::RequirementIssue.find_by(:issue_id => params[:issue_id]) || Impasse::RequirementIssue.create(:issue_id => params[:issue_id])
       node = Impasse::Node.find(params[:test_case_id])
       if node.is_test_case?
         create_requirement_case(requirement_issue.id, node.id)
@@ -59,7 +59,7 @@ def add_test_case
   def remove_test_case
     ActiveRecord::Base.transaction do
       requirement_issue = Impasse::RequirementIssue.find(params[:id])
-      requirement_cases = requirement_issue.requirement_cases.find(:first, :conditions => { :test_case_id => params[:test_case_id] })
+      requirement_cases = requirement_issue.requirement_cases.where(:test_case_id => params[:test_case_id]).first
       requirement_cases.destroy
 
       render :json => { :status => 'success', :message => l(:notice_successful_delete) }
@@ -68,7 +68,7 @@ def remove_test_case
 
   private
   def create_requirement_case(requirement_id, test_case_id) 
-    Impasse::RequirementCase.find_by_requirement_id_and_test_case_id(requirement_id, test_case_id) || Impasse::RequirementCase.create(:requirement_id => requirement_id, :test_case_id => test_case_id)
+    Impasse::RequirementCase.find_by(:requirement_id => requirement_id, :test_case_id => test_case_id) || Impasse::RequirementCase.create(:requirement_id => requirement_id, :test_case_id => test_case_id)
   end
 
 end

app/controllers/impasse_settings_controller.rb

@@ -7,12 +7,12 @@ def index
   end
 
   def edit
-    @setting = Impasse::Setting.find_or_create_by_project_id(:project_id => @project.id)
+    @setting = Impasse::Setting.find_or_initialize_by(:project_id => @project.id)
     unless params[:setting][:requirement_tracker]
       params[:setting][:requirement_tracker] = []
     end
-    @setting.attributes = params[:setting]
-    if request.put? or request.post?
+    @setting.update_attributes(params[:setting])
+    if request.put? or request.post? or request.patch?
       ActiveRecord::Base.transaction do
         custom_fields_by_type = {
           'Impasse::TestCaseCustomField'  => [],
@@ -30,7 +30,7 @@ def edit
         @project.execution_custom_fields  = custom_fields_by_type['Impasse::ExecutionCustomField']
         @setting.save!
         flash[:notice] = l(:notice_successful_update)
-        redirect_to :controller => '/projects', :action => 'settings', :id => @project, :tab => 'impasse'
+        redirect_to settings_project_path(@project, :tab => 'impasse')
       end
     end
   end

app/controllers/impasse_test_case_controller.rb

@@ -15,12 +15,12 @@ def index
       @allowed_projects = Issue.allowed_target_projects_on_move
       @allowed_projects.delete_if{|project| @project.id == project.id }
     end
-    @setting = Impasse::Setting.find_by_project_id(@project) || Impasse::Setting.create(:project_id => @project.id)
+    @setting = Impasse::Setting.find_by(:project_id => @project) || Impasse::Setting.create(:project_id => @project.id)
   end
 
   def list
     if params[:node_id].to_i == -1
-      root = Impasse::Node.find_by_name_and_node_type_id(@project.identifier, 1)
+      root = Impasse::Node.find_by(:name => @project.identifier, :node_type_id => 1)
       @nodes = Impasse::Node.find_children(root.id, params[:test_plan_id], params[:filters])
       root.name = get_root_name(params[:test_plan_id])
       @nodes.unshift(root)
@@ -34,16 +34,16 @@ def list
 
   def show
     @node, @test_case = get_node(params[:node])
-    @setting = Impasse::Setting.find_by_project_id(@project) || Impasse::Setting.create(:project_id => @project.id)
+    @setting = Impasse::Setting.find_by(:project_id => @project) || Impasse::Setting.create(:project_id => @project.id)
 
     render :partial => 'show'
   end
 
   def new
     new_node
-    @setting = Impasse::Setting.find_by_project_id(@project) || Impasse::Setting.create(:project_id => @project.id)
+    @setting = Impasse::Setting.find_by(:project_id => @project) || Impasse::Setting.create(:project_id => @project.id)
 
-    if request.post? or request.put?
+    if request.post? or request.put? or request.patch?
       begin
         ActiveRecord::Base.transaction do
           @node.save!
@@ -104,10 +104,10 @@ def move
 
   def edit
     @node, @test_case = get_node(params[:node])
-    @test_case.attributes = params[:test_case]
-    @setting = Impasse::Setting.find_by_project_id(@project) || Impasse::Setting.create(:project_id => @project.id)
+    @test_case.update_attributes(params[:test_case])
+    @setting = Impasse::Setting.find_by(:project_id => @project) || Impasse::Setting.create(:project_id => @project.id)
 
-    if request.post? or request.put?
+    if request.post? or request.put? or request.patch?
       begin
         ActiveRecord::Base.transaction do
           save_node(@node)
@@ -152,7 +152,7 @@ def destroy
       ActiveRecord::Base.transaction do
         node.all_decendant_cases_with_plan.each do |child|
           if child.planned?
-            Impasse::TestCase.update_all({:active => false}, ["id=?", child.id])
+            Impasse::TestCase.where(:id => child.id).update_all(:active => false)
             inactive_cases << child
           else
             case child.node_type_id
@@ -174,7 +174,7 @@ def destroy
   end
 
   def keywords
-    keywords = Impasse::Keyword.find_all_by_project_id(@project).map{|r| r.keyword}
+    keywords = Impasse::Keyword.where(:project_id => @project).map{|r| r.keyword}
     render :json => keywords
   end
 
@@ -218,7 +218,7 @@ def copy_to_another_project
           ActiveRecord::Base.transaction do
             new_node = node.dup
             if new_node.node_type_id == 1
-              root = Impasse::Node.find_by_name_and_node_type_id(dest_project.identifier, 1)
+              root = Impasse::Node.find_by(:name => dest_project.identifier, :node_type_id => 1)
               if root
                 new_node = root
                 # TODO get max node order
@@ -238,7 +238,7 @@ def copy_to_another_project
               new_test_suite.id = new_node.id
               new_test_suite.save!
             when 3
-              test_case = Impasse::TestCase.find(:first, :conditions => { :id => node.id }, :include => :test_steps)
+              test_case = Impasse::TestCase.where(:id => node.id).includes(:test_steps).first
               new_test_case = test_case.dup
               new_test_case.id = new_node.id
               new_test_case.save!
@@ -278,7 +278,7 @@ def new_node
 
   def get_node(node_params)
     node = Impasse::Node.find(node_params[:id])
-    node.attributes = node_params
+    node.update_attributes(node_params)
 
     if node.is_test_case?
       test_case = Impasse::TestCase.find(node_params[:id])
@@ -299,7 +299,7 @@ def save_node(node)
   end
 
   def save_keywords(node, keywords = "")
-    project_keywords = Impasse::Keyword.find_all_by_project_id(@project)
+    project_keywords = Impasse::Keyword.where(:project_id => @project)
     words = keywords.split(/\s*,\s*/)
     words.delete_if {|word| word =~ /^\s*$/}.uniq!
 
@@ -338,7 +338,7 @@ def get_root_name(test_plan_id)
   def find_project
     begin
       @project = Project.find(params[:project_id])
-      @project_node = Impasse::Node.find(:first, :conditions=>["name=? and node_type_id=?", @project.identifier, 1])
+      @project_node = Impasse::Node.where(:name => @project.identifier, :node_type_id => 1).first
       if @project_node.nil?
         @project_node = Impasse::Node.new(:name=>@project.identifier, :node_type_id=>1, :node_order=>1)
         @project_node.save
@@ -352,7 +352,7 @@ def copy_node(original_node, parent_id, level=0)
     node = original_node.dup
 
     if node.is_test_case?
-      original_case = Impasse::TestCase.find(original_node.id, :include => :test_steps)
+      original_case = Impasse::TestCase.where(:id => original_node.id).includes(:test_steps).first
       test_case = original_case.dup
       original_case.test_steps.each{|ts| test_case.test_steps << ts.dup }
     else

app/controllers/impasse_test_plans_controller.rb

@@ -15,13 +15,13 @@ def index
   end
 
   def show
-    @test_plan = Impasse::TestPlan.find(:first, :conditions => { :id => params[:id]}, :include => :version)
-    @setting = Impasse::Setting.find_by_project_id(@project) || Impasse::Setting.create(:project_id => @project.id)
+    @test_plan = Impasse::TestPlan.where(:id => params[:id]).includes(:version).first
+    @setting = Impasse::Setting.find_by(:project_id => @project) || Impasse::Setting.create(:project_id => @project.id)
   end
 
   def new
     @test_plan = Impasse::TestPlan.new(params[:test_plan])
-    if request.post? and @test_plan.save
+    if (request.post? or request.patch?) and @test_plan.save
       flash[:notice] = l(:notice_successful_create)
       redirect_to :action => :tc_assign, :project_id => @project, :id => @test_plan
     end
@@ -30,8 +30,8 @@ def new
 
   def edit
     @test_plan = Impasse::TestPlan.find(params[:id])
-    @test_plan.attributes = params[:test_plan]
-    if (request.post? or request.put?) and @test_plan.save
+    @test_plan.update_attributes(params[:test_plan])
+    if (request.post? or request.put? or request.patch?) and @test_plan.save
       flash[:notice] = l(:notice_successful_update)
       redirect_to :action => :show, :project_id => @project, :id => @test_plan
     end
@@ -40,16 +40,16 @@ def edit
 
   def destroy
     @test_plan = Impasse::TestPlan.find(params[:id])
-    if request.post? and @test_plan.destroy
+    if (request.post? or request.patch?) and @test_plan.destroy
       flash[:notice] = l(:notice_successful_delete)
       redirect_to :action => :index, :project_id => @project
     end
   end
 
   def copy
     @test_plan = Impasse::TestPlan.find(params[:id])
-    @test_plan.attributes = params[:test_plan]
-    if request.post? or request.put?
+    @test_plan.update_attributes(params[:test_plan])
+    if request.post? or request.put? or request.patch?
       ActiveRecord::Base.transaction do
         new_test_plan = @test_plan.dup
         new_test_plan.save!
@@ -100,7 +100,7 @@ def statistics
   def add_test_case
     if params.include? :test_case_ids
       new_cases = 0
-      nodes = Impasse::Node.find(:all, :conditions => ["id in (?)", params[:test_case_ids]])
+      nodes = Impasse::Node.where("id in (?)", params[:test_case_ids])
       ActiveRecord::Base.transaction do
         for node in nodes
           test_case_ids = []
@@ -112,8 +112,7 @@ def add_test_case
 
           for test_case_id in test_case_ids
             test_plan_case =
-              Impasse::TestPlanCase.find_or_create_by_test_case_id_and_test_plan_id(
-                                                                                    :test_case_id => test_case_id,
+              Impasse::TestPlanCase.find_or_create_by(:test_case_id => test_case_id,
                                                                                     :test_plan_id => params[:test_plan_id],
                                                                                     :node_order => 0)
             new_cases += 1
@@ -131,7 +130,7 @@ def remove_test_case
   end
 
   def autocomplete
-    @users = @project.users.like(params[:q]).all(:limit => 100)
+    @users = @project.users.like(params[:q]).limit(100)
     render :layout => false
   end
 end