rails_workflow 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d915e644089da2fedba7b781be104cfde631666
-  data.tar.gz: 8da47e80bd20e0b966e0d11a731fa5a9826fc2e9
+  metadata.gz: 9d9c8eaa468d96c673e8c20fe12be01411823ad7
+  data.tar.gz: 8da87c13b5663694330a10cd7f3d477088ffd392
 SHA512:
-  metadata.gz: 6e69c4736476066a9239d8535c39ee7fc82d4411af77d72c917713d5afcde94e64ed3bfb8d581a880a0b94fa9d8f2ea62fe30bf60a8b2db860e15f4b38ca5aa8
-  data.tar.gz: 7d318f97f4c8e7f6b4e51593572b29745315f7b6c8eae31d2eb4482065a88a87c073b424f2243882e250bc6dc06f469f88e056c94178bc9d894880b30cb79b8e
+  metadata.gz: 70fb5d1821f378b3d16db02930ee8dba499ecb2fea1bc2b8334048abf4a92655fbbc63e07730e928d57d4ffd16a3e1e99c83648336af55bac269ba509c1cf74a
+  data.tar.gz: c2656ba296717d17d369d3a4aa19039c9abda7ca3141daf8e4f2bde1486185744d2a8b610bdea7fa19ea0cd50d7221a2796ea5ba068e4d982c170930386709b7

data/app/models/rails_workflow/process.rb

@@ -47,7 +47,7 @@ module RailsWorkflow
     # Returns set or operation that not yet completed.
     # Operation complete in DONE, SKIPPED, CANCELED, etc many other statuses
     def uncompleted_operations
-      operations(true).reject(&:completed?)
+      operations.reject(&:completed?)
     end
 
     def can_start?

data/app/serializers/rails_workflow/process_template_serializer.rb

@@ -19,7 +19,7 @@ module RailsWorkflow
     def child_processes
       children = object.operations.map(&:child_process).compact.uniq
       unless children.blank?
-        ActiveModel::ArraySerializer.new(
+        ActiveModel::Serializer::CollectionSerializer.new(
           children,
           each_serializer: ProcessTemplateSerializer
         ).as_json

data/app/services/rails_workflow/default_importer_preprocessor.rb

@@ -3,6 +3,7 @@
 module RailsWorkflow
   class DefaultImporterPreprocessor
     def prepare(json)
+      # TODO test after update to Rails 5. Also check with subprocesses
       if json['operations']
         json['process_template']['operations'] = json['operations']
         json['process_template'].delete('operation_ids')

data/db/migrate/20150630174700_create_workflow_processes.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreateWorkflowProcesses < ActiveRecord::Migration
+class CreateWorkflowProcesses < ActiveRecord::Migration[4.2]
   def change
     create_tables
     create_columns

data/lib/rails_workflow/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsWorkflow
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

data/spec/controllers/rails_workflow/operation_templates_controller_spec.rb

@@ -22,13 +22,11 @@ module RailsWorkflow
       skip('Add a hash of attributes invalid for your model')
     end
 
-    let(:valid_session) {}
-
     describe 'GET index' do
       it 'assigns all operation_templates as @operation_templates' do
         operation_template = OperationTemplate.create! valid_attributes
 
-        get :index, { process_template_id: @template.id }, valid_session, use_route: :workflow
+        get :index, params: { process_template_id: @template.id }
         expect(assigns(:operation_templates)).to eq([operation_template])
       end
     end
@@ -37,10 +35,10 @@ module RailsWorkflow
       it 'assigns the requested operation_template as @operation_template' do
         operation_template = OperationTemplate.create! valid_attributes
 
-        get :show, {
+        get :show, params: {
           process_template_id: @template.id,
           id: operation_template.to_param
-        }, valid_session, use_route: :workflow
+        }
 
         expect(assigns(:operation_template)).to eq(operation_template)
       end
@@ -50,7 +48,7 @@ module RailsWorkflow
       it 'assigns a new operation_template as @operation_template' do
         template = create(:process_template)
 
-        get :new, { process_template_id: template.id }, valid_session, use_route: :workflow
+        get :new, params: { process_template_id: template.id }
         expect(assigns(:operation_template)).to be_a_new(OperationTemplate)
       end
     end
@@ -58,10 +56,10 @@ module RailsWorkflow
     describe 'GET edit' do
       it 'assigns the requested operation_template as @operation_template' do
         operation_template = OperationTemplate.create! valid_attributes
-        get :edit, {
+        get :edit, params: {
           process_template_id: @template.id,
           id: operation_template.to_param
-        }, valid_session, use_route: :workflow
+        }
         expect(assigns(:operation_template)).to eq(operation_template)
       end
     end
@@ -70,10 +68,10 @@ module RailsWorkflow
       describe 'with valid params' do
         it 'creates a new OperationTemplate' do
           expect do
-            post :create, {
+            post :create, params: {
               process_template_id: @template.id,
               operation_template: valid_attributes
-            }, valid_session, use_route: :workflow
+            }
           end.to change(OperationTemplate, :count).by(1)
 
           expect(@template.operations.count).to eq 1
@@ -83,40 +81,42 @@ module RailsWorkflow
           attrs = valid_attributes
           attrs[:type] = 'RailsWorkflow::CustomOperationTemplate'
           expect do
-            post :create, {
+            post :create, params: {
               process_template_id: @template.id,
               operation_template: valid_attributes
-            }, valid_session, use_route: :workflow
+            }
           end.to change(RailsWorkflow::CustomOperationTemplate, :count).by(1)
         end
 
         it 'assigns a newly created operation_template as @operation_template' do
-          post :create, {
+          post :create, params: {
             process_template_id: @template.id,
             operation_template: valid_attributes
-          }, valid_session, use_route: :workflow
+          }
 
           # expect(assigns(:operation_template)).to be_a(OperationTemplate)
           # expect(assigns(:operation_template)).to be_persisted
         end
 
         it 'redirects to the created operation_template' do
-          post :create, {
+          post :create, params: {
             process_template_id: @template.id,
             operation_template: valid_attributes
-          }, valid_session, use_route: :workflow
-          expect(response).to redirect_to(process_template_operation_templates_path(@template.id))
+          }
+          expect(response).to redirect_to(
+            process_template_operation_templates_path(@template.id)
+          )
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved operation_template as @operation_template' do
-          post :create, { operation_template: invalid_attributes }, valid_session, use_route: :workflow
+          post :create, params: { operation_template: invalid_attributes }
           expect(assigns(:operation_template)).to be_a_new(OperationTemplate)
         end
 
         it "re-renders the 'new' template" do
-          post :create, { operation_template: invalid_attributes }, valid_session, use_route: :workflow
+          post :create, params: { operation_template: invalid_attributes }
           expect(response).to render_template('new')
         end
       end
@@ -130,7 +130,10 @@ module RailsWorkflow
 
         it 'updates the requested operation_template' do
           operation_template = OperationTemplate.create! valid_attributes
-          put :update, { id: operation_template.to_param, operation_template: new_attributes }, valid_session, use_route: :workflow
+          put :update, params: {
+            id: operation_template.to_param,
+            operation_template: new_attributes
+          }
           operation_template.reload
           skip('Add assertions for updated state')
         end
@@ -138,10 +141,11 @@ module RailsWorkflow
         it 'assigns the requested operation_template as @operation_template' do
           operation_template = OperationTemplate.create! valid_attributes
 
-          put :update, { process_template_id: @template.id,
-                         id: operation_template.to_param,
-                         operation_template: valid_attributes },
-              valid_session, use_route: :workflow
+          put :update, params: {
+            process_template_id: @template.id,
+            id: operation_template.to_param,
+            operation_template: valid_attributes
+          }
 
           # expect(assigns(:operations)).to eq([operation_template])
         end
@@ -149,26 +153,34 @@ module RailsWorkflow
         it 'redirects to the operation_template' do
           operation_template = OperationTemplate.create! valid_attributes
 
-          put :update, {
+          put :update, params: {
             process_template_id: @template.id,
             id: operation_template.to_param,
             operation_template: valid_attributes
-          }, valid_session, use_route: :workflow
+          }
 
-          expect(response).to redirect_to(process_template_operation_templates_path(@template.id))
+          expect(response).to redirect_to(
+            process_template_operation_templates_path(@template.id)
+          )
         end
       end
 
       describe 'with invalid params' do
         it 'assigns the operation_template as @operation_template' do
           operation_template = OperationTemplate.create! valid_attributes
-          put :update, { id: operation_template.to_param, operation_template: invalid_attributes }, valid_session, use_route: :workflow
+          put :update, params: {
+            id: operation_template.to_param,
+            operation_template: invalid_attributes
+          }
           expect(assigns(:operation_template)).to eq(operation_template)
         end
 
         it "re-renders the 'edit' template" do
           operation_template = OperationTemplate.create! valid_attributes
-          put :update, { id: operation_template.to_param, operation_template: invalid_attributes }, valid_session, use_route: :workflow
+          put :update, params: {
+            id: operation_template.to_param,
+            operation_template: invalid_attributes
+          }
           expect(response).to render_template('edit')
         end
       end
@@ -178,20 +190,22 @@ module RailsWorkflow
       it 'destroys the requested operation_template' do
         operation_template = OperationTemplate.create! valid_attributes
         expect do
-          delete :destroy, {
+          delete :destroy, params: {
             process_template_id: operation_template.process_template.id,
             id: operation_template.to_param
-          }, valid_session, use_route: :workflow
+          }
         end.to change(OperationTemplate, :count).by(-1)
       end
 
       it 'redirects to the operation_templates list' do
         operation_template = OperationTemplate.create! valid_attributes
-        delete :destroy, {
+        delete :destroy, params: {
           process_template_id: @template.id,
           id: operation_template.to_param
-        }, valid_session, use_route: :workflow
-        expect(response).to redirect_to(process_template_operation_templates_path(@template))
+        }
+        expect(response).to redirect_to(
+          process_template_operation_templates_path(@template)
+        )
       end
     end
   end

data/spec/controllers/rails_workflow/process_templates_controller_spec.rb

@@ -14,12 +14,10 @@ module RailsWorkflow
       skip('Add a hash of attributes invalid for your model')
     end
 
-    let(:valid_session) { {} }
-
     describe 'GET index' do
       it 'assigns all process_templates as @process_templates' do
         process_template = ProcessTemplate.create! valid_attributes
-        get :index, {}, valid_session
+        get :index
         expect(assigns(:process_templates)).to eq([process_template])
       end
     end
@@ -27,14 +25,14 @@ module RailsWorkflow
     describe 'GET show' do
       it 'assigns the requested process_template as @process_template' do
         process_template = ProcessTemplate.create! valid_attributes
-        get :show, { id: process_template.to_param }, valid_session
+        get :show, params: { id: process_template.to_param }
         expect(assigns(:process_template)).to eq(process_template)
       end
     end
 
     describe 'GET new' do
       it 'assigns a new process_template as @process_template' do
-        get :new, {}, valid_session
+        get :new
         expect(assigns(:process_template)).to be_a_new(ProcessTemplate)
       end
     end
@@ -42,7 +40,7 @@ module RailsWorkflow
     describe 'GET edit' do
       it 'assigns the requested process_template as @process_template' do
         process_template = ProcessTemplate.create! valid_attributes
-        get :edit, { id: process_template.to_param }, valid_session
+        get :edit, params: { id: process_template.to_param }
         expect(assigns(:process_template)).to eq(process_template)
       end
     end
@@ -51,30 +49,30 @@ module RailsWorkflow
       describe 'with valid params' do
         it 'creates a new WfProcessTemplate' do
           expect do
-            post :create, { process_template: valid_attributes }, valid_session
+            post :create, params: { process_template: valid_attributes }
           end.to change(ProcessTemplate, :count).by(1)
         end
 
         it 'assigns a newly created process_template as @process_template' do
-          post :create, { process_template: valid_attributes }, valid_session, use_route: :workflow
+          post :create, params: { process_template: valid_attributes }
           expect(assigns(:process_template)).to be_a(ProcessTemplate)
           expect(assigns(:process_template)).to be_persisted
         end
 
         it 'redirects to the created process_template' do
-          post :create, { process_template: valid_attributes }, valid_session
+          post :create, params: { process_template: valid_attributes }
           expect(response).to redirect_to(process_template_operation_templates_path(ProcessTemplate.last))
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved process_template as @process_template' do
-          post :create, { process_template: invalid_attributes }, valid_session
+          post :create, params: { process_template: invalid_attributes }
           expect(assigns(:process_template)).to be_a_new(ProcessTemplate)
         end
 
         it "re-renders the 'new' template" do
-          post :create, { process_template: invalid_attributes }, valid_session
+          post :create, params: { process_template: invalid_attributes }
           expect(response).to render_template('new')
         end
       end
@@ -88,20 +86,29 @@ module RailsWorkflow
 
         it 'updates the requested process_template' do
           process_template = ProcessTemplate.create! valid_attributes
-          put :update, { id: process_template.to_param, process_template: new_attributes }, valid_session
+          put :update, params: {
+            id: process_template.to_param,
+            process_template: new_attributes
+          }
           process_template.reload
           skip('Add assertions for updated state')
         end
 
         it 'assigns the requested process_template as @process_template' do
           process_template = ProcessTemplate.create! valid_attributes
-          put :update, { id: process_template.to_param, process_template: valid_attributes }, valid_session
+          put :update, params: {
+            id: process_template.to_param,
+            process_template: valid_attributes
+          }
           expect(assigns(:process_template)).to eq(process_template)
         end
 
         it 'redirects to the process_template' do
           process_template = ProcessTemplate.create! valid_attributes
-          put :update, { id: process_template.to_param, process_template: valid_attributes }, valid_session
+          put :update, params: {
+            id: process_template.to_param,
+            process_template: valid_attributes
+          }
           expect(response).to redirect_to(process_template)
         end
       end
@@ -109,13 +116,19 @@ module RailsWorkflow
       describe 'with invalid params' do
         it 'assigns the process_template as @process_template' do
           process_template = ProcessTemplate.create! valid_attributes
-          put :update, { id: process_template.to_param, process_template: invalid_attributes }, valid_session
+          put :update, params: {
+            id: process_template.to_param,
+            process_template: invalid_attributes
+          }
           expect(assigns(:process_template)).to eq(process_template)
         end
 
         it "re-renders the 'edit' template" do
           process_template = ProcessTemplate.create! valid_attributes
-          put :update, { id: process_template .to_param, process_template: invalid_attributes }, valid_session
+          put :update, params: {
+            id: process_template.to_param,
+            process_template: invalid_attributes
+          }
           expect(response).to render_template('edit')
         end
       end
@@ -125,13 +138,13 @@ module RailsWorkflow
       it 'destroys the requested process_template' do
         process_template = ProcessTemplate.create! valid_attributes
         expect do
-          delete :destroy, { id: process_template.to_param }, valid_session
+          delete :destroy, params: { id: process_template.to_param }
         end.to change(ProcessTemplate, :count).by(-1)
       end
 
       it 'redirects to the process_templates list' do
         process_template = ProcessTemplate.create! valid_attributes
-        delete :destroy, { id: process_template.to_param }, valid_session
+        delete :destroy, params: { id: process_template.to_param }
         expect(response).to redirect_to(process_templates_url)
       end
     end

data/spec/controllers/rails_workflow/processes_controller_spec.rb

@@ -21,35 +21,33 @@ module RailsWorkflow
       skip('Add a hash of attributes invalid for your model')
     end
 
-    let(:valid_session) { {} }
-
     describe 'GET index' do
       it 'assigns all processes as @processes' do
-        process = Process.create! valid_attributes
-        get :index, {}, valid_session
+        process = RailsWorkflow::Process.create! valid_attributes
+        get :index
         expect(assigns(:processes)).to eq([process])
       end
     end
 
     describe 'GET show' do
       it 'assigns the requested process as @process' do
-        process = Process.create! valid_attributes
-        get :show, { id: process.to_param }, valid_session
+        process = RailsWorkflow::Process.create! valid_attributes
+        get :show, params: { id: process.to_param }
         expect(assigns(:process)).to eq(process)
       end
     end
 
     describe 'GET new' do
       it 'assigns a new process as @process' do
-        get :new, {}, valid_session, use_route: :workflow
+        get :new
         expect(assigns(:process)).to be_a_new(Process)
       end
     end
 
     describe 'GET edit' do
       it 'assigns the requested process as @process' do
-        process = Process.create! valid_attributes
-        get :edit, { id: process.to_param }, valid_session
+        process = RailsWorkflow::Process.create! valid_attributes
+        get :edit, params: { id: process.to_param }
         expect(assigns(:process)).to eq(process)
       end
     end
@@ -58,30 +56,30 @@ module RailsWorkflow
       describe 'with valid params' do
         it 'creates a new WfProcess' do
           expect do
-            post :create, { process: valid_attributes }, valid_session
+            post :create, params: { process: valid_attributes }
           end.to change(RailsWorkflow::Process, :count).by(1)
         end
 
         it 'assigns a newly created process as @process' do
-          post :create, { process: valid_attributes }, valid_session
+          post :create, params: { process: valid_attributes }
           expect(assigns(:process)).to be_a(Process)
           expect(assigns(:process)).to be_persisted
         end
 
         it 'redirects to the created process' do
-          post :create, { process: valid_attributes }, valid_session
+          post :create, params: { process: valid_attributes }
           expect(response).to redirect_to(Process.last)
         end
       end
 
       describe 'with invalid params' do
         it 'assigns a newly created but unsaved process as @process' do
-          post :create, { process: invalid_attributes }, valid_session
+          post :create, params: { process: invalid_attributes }
           expect(assigns(:process)).to be_a_new(Process)
         end
 
         it "re-renders the 'new' template" do
-          post :create, { process: invalid_attributes }, valid_session
+          post :create, params: { process: invalid_attributes }
           expect(response).to render_template('new')
         end
       end
@@ -95,20 +93,26 @@ module RailsWorkflow
 
         it 'updates the requested process' do
           process = Process.create! valid_attributes
-          put :update, { id: process.to_param, process: new_attributes }, valid_session
+          put :update, params: { id: process.to_param, process: new_attributes }
           process.reload
           skip('Add assertions for updated state')
         end
 
         it 'assigns the requested process as @process' do
           process = Process.create! valid_attributes
-          put :update, { id: process.to_param, process: valid_attributes }, valid_session
+          put :update, params: {
+            id: process.to_param,
+            process: valid_attributes
+          }
           expect(assigns(:process)).to eq(process)
         end
 
         it 'redirects to the process' do
           process = Process.create! valid_attributes
-          put :update, { id: process.to_param, process: valid_attributes }, valid_session
+          put :update, params: {
+            id: process.to_param,
+            process: valid_attributes
+          }
           expect(response).to redirect_to(processes_path)
         end
       end
@@ -116,13 +120,19 @@ module RailsWorkflow
       describe 'with invalid params' do
         it 'assigns the process as @process' do
           process = Process.create! valid_attributes
-          put :update, { id: process.to_param, process: invalid_attributes }, valid_session
+          put :update, params: {
+            id: process.to_param,
+            process: invalid_attributes
+          }
           expect(assigns(:process)).to eq(process)
         end
 
         it "re-renders the 'edit' template" do
           process = Process.create! valid_attributes
-          put :update, { id: process.to_param, process: invalid_attributes }, valid_session
+          put :update, params: {
+            id: process.to_param,
+            process: invalid_attributes
+          }
           expect(response).to render_template('edit')
         end
       end