From 232e59069f5dc64ceb5207e7e2ba2a790746eb1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= <karel.picman@kontron.com>
Date: Fri, 9 Nov 2018 09:03:33 +0100
Subject: [PATCH] https://github.com/rubocop-hq/rails-style-guide

---
 test/fixtures/dmsf_file_revisions.yml         |  4 +--
 .../dmsf_workflow_step_assignments.yml        |  2 +-
 test/functional/my_controller_test.rb         | 26 -------------------
 3 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/test/fixtures/dmsf_file_revisions.yml b/test/fixtures/dmsf_file_revisions.yml
index 80ff3d62..c5702320 100644
--- a/test/fixtures/dmsf_file_revisions.yml
+++ b/test/fixtures/dmsf_file_revisions.yml
@@ -96,7 +96,7 @@ dmsf_file_revisions_005:
   mime_type:                     text/plain
   title:                         "Test File"
   description:                   NULL
-  workflow:                      NULL
+  workflow:                      1 # DmsfWorkflow::STATE_WAITING_FOR_APPROVAL
   minor_version:                 0
   major_version:                 1
   comment:                       NULL
@@ -105,7 +105,7 @@ dmsf_file_revisions_005:
   user_id:                       1
   dmsf_workflow_assigned_by:     NULL
   dmsf_workflow_started_by:      NULL
-  created_at:                    2017-04-18 14:52:27 +02:00
+  created_at:                    2017-04-18 14:52:28 +02:00
 
 dmsf_file_revisions_006:
   id:                            6
diff --git a/test/fixtures/dmsf_workflow_step_assignments.yml b/test/fixtures/dmsf_workflow_step_assignments.yml
index c8e0760b..85d1c1fe 100644
--- a/test/fixtures/dmsf_workflow_step_assignments.yml
+++ b/test/fixtures/dmsf_workflow_step_assignments.yml
@@ -51,4 +51,4 @@ wfsa9:
   id: 9
   dmsf_workflow_step_id: 5
   user_id: 2
-  dmsf_file_revision_id: 1
\ No newline at end of file
+  dmsf_file_revision_id: 5
\ No newline at end of file
diff --git a/test/functional/my_controller_test.rb b/test/functional/my_controller_test.rb
index f7eb0df1..45dd6b71 100644
--- a/test/functional/my_controller_test.rb
+++ b/test/functional/my_controller_test.rb
@@ -38,32 +38,6 @@ class MyControllerTest < RedmineDmsf::Test::TestCase
   end
   
   def test_page_with_open_approvals_block
-    ### Postgres test
-    all_assignments = DmsfWorkflowStepAssignment.joins(
-      'LEFT JOIN dmsf_workflow_step_actions ON dmsf_workflow_step_assignments.id = dmsf_workflow_step_actions.dmsf_workflow_step_assignment_id').where(
-      :dmsf_workflow_step_assignments => { :user_id => @user_member.id }).where(
-      ['dmsf_workflow_step_actions.id IS NULL OR dmsf_workflow_step_actions.action = ?', DmsfWorkflowStepAction::ACTION_DELEGATE])
-    puts all_assignments.to_sql
-    puts "all assignments count: #{all_assignments.all.size}"
-    assignments = []
-    all_assignments.find_each do |assignment|
-      puts assignment.id
-      puts assignment.dmsf_file_revision.dmsf_file.last_revision.present?
-      puts assignment.dmsf_file_revision.dmsf_file.last_revision.deleted?
-      puts assignment.dmsf_file_revision.workflow
-      puts "#{assignment.dmsf_file_revision.id} == #{assignment.dmsf_file_revision.dmsf_file.last_revision.id}"
-      if assignment.dmsf_file_revision.dmsf_file.last_revision &&
-        !assignment.dmsf_file_revision.dmsf_file.last_revision.deleted? &&
-        (assignment.dmsf_file_revision.workflow == DmsfWorkflow::STATE_WAITING_FOR_APPROVAL) &&
-        (assignment.dmsf_file_revision.id == assignment.dmsf_file_revision.dmsf_file.last_revision.id)
-        assignments << assignment
-        puts 'yes'
-      else
-        puts 'no'
-      end
-    end
-    puts "open assignments count: #{assignments.size}"
-    ###
     @user_member.pref[:my_page_layout] = { 'top' => ['open_approvals'] }
     @user_member.pref.save!    
     get :page