Fix activities and specs

app/helpers/global_activities_helper.rb

@@ -65,11 +65,7 @@ module GlobalActivitiesHelper
       path = if obj.archived?
                module_archive_experiment_path(obj.experiment)
              else
-               path = if %w(assign_repository_record unassign_repository_record).include? activity.type_of
+               protocols_my_module_path(obj)
-                        repository_my_module_path(obj, activity.values['message_items']['repository']['id'])
-                      else
-                        protocols_my_module_path(obj)
-                      end
              end
     when Protocol
       if obj.in_repository_public?

app/views/global_activities/references/_my_module.html.erb

@@ -6,11 +6,7 @@
     <% if subject.archived?
         path = module_archive_experiment_path(subject.experiment)
       else
-        if (['assign_repository_record','unassign_repository_record'].include? type_of)
+        path = protocols_my_module_path(subject)
-          path = repository_my_module_path(subject,values["message_items"]["repository"]["id"])
-        else 
-          path = protocols_my_module_path(subject)
-        end
       end %>
     <%= route_to_other_team(path,
                             team,

spec/controllers/my_module_repositories_controller_spec.rb

@@ -0,0 +1,175 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe MyModuleRepositoriesController, type: :controller do
+  login_user
+
+  let(:user) { subject.current_user }
+  let(:team) { create :team, created_by: user }
+  let!(:user_team) { create :user_team, :admin, user: user, team: team }
+  let(:project) { create :project, team: team, created_by: user }
+  let!(:user_project) do
+    create :user_project, :normal_user, user: user, project: project
+  end
+  let!(:repository) { create :repository, created_by: user, team: team }
+  let!(:repository_row) do
+    create :repository_row, created_by: user, repository: repository
+  end
+  let!(:repository_row_2) do
+    create :repository_row, created_by: user, repository: repository
+  end
+  let(:experiment) { create :experiment, project: project }
+  let(:my_module) { create :my_module, experiment: experiment }
+
+  describe 'PUT update (assign repository records)' do
+    let(:params) do
+      { my_module_id: my_module.id,
+        id: repository.id,
+        rows_to_assign: [repository_row.id],
+        downstream: false }
+    end
+    let(:action) do
+      put :update, params: params, format: :json
+    end
+
+    it 'calls create activity for assign_repository_record' do
+      expect(Activities::CreateActivityService)
+        .to(receive(:call)
+              .with(hash_including(activity_type:
+                                     :assign_repository_record)))
+      action
+    end
+
+    it 'adds activity in DB' do
+      expect { action }
+        .to(change { Activity.count })
+    end
+  end
+
+  describe 'PUT update (assign repository records downstream)' do
+    it 'adds activity id DB' do
+      parent_my_module = my_module
+      params_downstream = { my_module_id: parent_my_module.id,
+                            id: repository.id,
+                            rows_to_assign: [repository_row.id],
+                            downstream: true }
+      3.times do |_i|
+        child_module = create :my_module, experiment: experiment
+        Connection.create(output_id: parent_my_module.id, input_id: child_module.id)
+      end
+      expect { put :update, params: params_downstream, format: :json }
+        .to change { Activity.count }.by(4)
+    end
+  end
+
+  describe 'PUT update (unassign repository records)' do
+    let!(:mm_repository_row) do
+      create :mm_repository_row, repository_row: repository_row,
+                                 my_module: my_module,
+                                 assigned_by: user
+    end
+    let(:params) do
+      { my_module_id: my_module.id,
+        id: repository.id,
+        rows_to_unassign: [repository_row.id],
+        downstream: false }
+    end
+    let(:action) do
+      put :update, params: params, format: :json
+    end
+
+    it 'calls create activity for unassign_repository_record' do
+      expect(Activities::CreateActivityService)
+        .to(receive(:call)
+              .with(hash_including(activity_type:
+                                     :unassign_repository_record)))
+      action
+    end
+
+    it 'adds activity in DB' do
+      expect { action }
+        .to(change { Activity.count })
+    end
+  end
+
+  describe 'PUT update (unassign repository records downstream)' do
+    it 'adds activity id DB' do
+      parent_my_module = my_module
+      create :mm_repository_row, repository_row: repository_row,
+                                 my_module: parent_my_module,
+                                 assigned_by: user
+      params_downstream = { my_module_id: parent_my_module.id,
+                            id: repository.id,
+                            rows_to_unassign: [repository_row.id],
+                            downstream: true }
+      3.times do |_i|
+        child_module = create :my_module, experiment: experiment
+        Connection.create(output_id: parent_my_module.id, input_id: child_module.id)
+        create :mm_repository_row, repository_row: repository_row,
+                                 my_module: child_module,
+                                 assigned_by: user
+      end
+      put :update, params: params_downstream, format: :json
+      expect(Activity.count).to eq 4
+    end
+  end
+
+  describe 'PUT update (assign and unassign repository records)' do
+    let!(:mm_repository_row) do
+      create :mm_repository_row, repository_row: repository_row_2,
+                                 my_module: my_module,
+                                 assigned_by: user
+    end
+    let(:params) do
+      { my_module_id: my_module.id,
+        id: repository.id,
+        rows_to_assign: [repository_row.id],
+        rows_to_unassign: [repository_row_2.id],
+        downstream: false }
+    end
+    let(:action) do
+      put :update, params: params, format: :json
+    end
+
+    it 'calls create activity for assign_repository_record and unassign_repository_record' do
+      expect(Activities::CreateActivityService)
+        .to(receive(:call)
+              .with(hash_including(activity_type:
+                                     :assign_repository_record)))
+      expect(Activities::CreateActivityService)
+        .to(receive(:call)
+              .with(hash_including(activity_type:
+                                     :unassign_repository_record)))
+      action
+    end
+
+    it 'adds activity in DB' do
+      expect { action }
+        .to(change { Activity.count })
+    end
+  end
+
+  describe 'PUT update (assign and unassign repository records downstream)' do
+    it 'adds activity id DB' do
+      parent_my_module = my_module
+      create :mm_repository_row, repository_row: repository_row_2,
+                                 my_module: parent_my_module,
+                                 assigned_by: user
+      params_downstream = { my_module_id: parent_my_module.id,
+                            id: repository.id,
+                            rows_to_assign: [repository_row.id],
+                            rows_to_unassign: [repository_row_2.id],
+                            downstream: true }
+      3.times do |_i|
+        child_module = create :my_module, experiment: experiment
+        Connection.create(output_id: parent_my_module.id, input_id: child_module.id)
+        create :mm_repository_row, repository_row: repository_row_2,
+                                 my_module: child_module,
+                                 assigned_by: user
+      end
+      put :update, params: params_downstream, format: :json
+      expect(Activity.count).to eq 8
+    end
+  end
+end

spec/controllers/my_modules_controller_spec.rb

@@ -123,99 +123,6 @@ describe MyModulesController, type: :controller do
     end
   end
 
-  describe 'POST assign_repository_records' do
-    let(:params) do
-      { id: my_module.id,
-        repository_id: repository.id,
-        selected_rows: [repository_row.id],
-        downstream: false }
-    end
-    let(:action) do
-      post :assign_repository_records, params: params, format: :json
-    end
-
-    it 'calls create activity for assign_repository_record' do
-      expect(Activities::CreateActivityService)
-        .to(receive(:call)
-              .with(hash_including(activity_type:
-                                     :assign_repository_record)))
-      action
-    end
-
-    it 'adds activity in DB' do
-      expect { action }
-        .to(change { Activity.count })
-    end
-  end
-
-  describe 'POST assign_repository_records_downstream' do
-    it 'adds activity id DB' do
-      parent_my_module = my_module
-      params_downstream = { id: parent_my_module.id,
-                            repository_id: repository.id,
-                            selected_rows: [repository_row.id],
-                            downstream: true }
-      3.times do |_i|
-        child_module = create :my_module, experiment: experiment
-        Connection.create(output_id: parent_my_module.id, input_id: child_module.id)
-      end
-      expect { post :assign_repository_records, params: params_downstream, format: :json }
-        .to change { Activity.count }.by(4)
-    end
-  end
-
-  describe 'POST unassign_repository_records' do
-    let!(:mm_repository_row) do
-      create :mm_repository_row, repository_row: repository_row,
-                                 my_module: my_module,
-                                 assigned_by: user
-    end
-    let(:params) do
-      { id: my_module.id,
-        repository_id: repository.id,
-        selected_rows: [repository_row.id],
-        downstream: false }
-    end
-    let(:action) do
-      post :unassign_repository_records, params: params, format: :json
-    end
-
-    it 'calls create activity for unassign_repository_record' do
-      expect(Activities::CreateActivityService)
-        .to(receive(:call)
-              .with(hash_including(activity_type:
-                                     :unassign_repository_record)))
-      action
-    end
-
-    it 'adds activity in DB' do
-      expect { action }
-        .to(change { Activity.count })
-    end
-  end
-
-  describe 'POST unassign_repository_records_downstream' do
-    it 'adds activity id DB' do
-      parent_my_module = my_module
-      create :mm_repository_row, repository_row: repository_row,
-                                 my_module: parent_my_module,
-                                 assigned_by: user
-      params_downstream = { id: parent_my_module.id,
-                            repository_id: repository.id,
-                            selected_rows: [repository_row.id],
-                            downstream: true }
-      3.times do |_i|
-        child_module = create :my_module, experiment: experiment
-        Connection.create(output_id: parent_my_module.id, input_id: child_module.id)
-        create :mm_repository_row, repository_row: repository_row,
-                                 my_module: child_module,
-                                 assigned_by: user
-      end
-      post :unassign_repository_records, params: params_downstream, format: :json
-      expect(Activity.count).to eq 4
-    end
-  end
-
   describe 'POST toggle_task_state' do
     let(:action) { post :toggle_task_state, params: params, format: :json }
     let(:params) { { id: my_module.id } }