diff --git a/app/models/dmsf_workflow.rb b/app/models/dmsf_workflow.rb index 90028c31..474f1c6a 100644 --- a/app/models/dmsf_workflow.rb +++ b/app/models/dmsf_workflow.rb @@ -21,7 +21,7 @@ class DmsfWorkflow < ActiveRecord::Base - has_many :dmsf_workflow_steps, -> { order(step: :asc, operator: :desc) }, dependent: :destroy + has_many :dmsf_workflow_steps, -> { order(step: :asc) }, dependent: :destroy belongs_to :author, class_name: 'User' scope :sorted, lambda { order(name: :asc) } diff --git a/test/functional/dmsf_workflow_controller_test.rb b/test/functional/dmsf_workflow_controller_test.rb index 0844609c..acaa3389 100644 --- a/test/functional/dmsf_workflow_controller_test.rb +++ b/test/functional/dmsf_workflow_controller_test.rb @@ -396,14 +396,12 @@ class DmsfWorkflowsControllerTest < RedmineDmsf::Test::TestCase end def test_log_member_local_wf - @request.session[:user_id] = @jsmith.id get :log, params: { id: @wf1.id, project_id: @project1.id, dmsf_file_id: @file1.id, format: 'js' }, xhr: true assert_response :success assert_template :log end def test_log_member_global_wf - @request.session[:user_id] = @jsmith.id get :log, params: { id: @wf3.id, project_id: @project1.id, dmsf_file_id: @file1.id, format: 'js' }, xhr: true assert_response :success assert_template :log @@ -416,4 +414,10 @@ class DmsfWorkflowsControllerTest < RedmineDmsf::Test::TestCase assert_template :log end + def test_new_step + get :new_step, params: { id: @wf1.id } + assert_response :success + assert_template :new_step + end + end