hyrax 2.0.0.rc1 → 2.0.0.rc2

data/spec/controllers/hyrax/generic_works_controller_spec.rb

@@ -58,7 +58,7 @@ RSpec.describe Hyrax::GenericWorksController do
           expect(controller).to receive(:add_breadcrumb).with('test title', main_app.hyrax_generic_work_path(work.id, locale: 'en'))
           get :show, params: { id: work }
           expect(response).to be_successful
-          expect(response).to render_template("layouts/hyrax")
+          expect(response).to render_template("layouts/hyrax/1_column")
         end
       end
 

data/spec/controllers/hyrax/homepage_controller_spec.rb

@@ -98,7 +98,7 @@ RSpec.describe Hyrax::HomepageController, type: :controller do
     end
 
     context "with featured works" do
-      let!(:my_work) { FactoryGirl.create(:work, user: user) }
+      let!(:my_work) { FactoryBot.create(:work, user: user) }
 
       before do
         FeaturedWork.create!(work_id: my_work.id)

data/spec/controllers/hyrax/pages_controller_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe Hyrax::PagesController, type: :controller do
-  let(:user) { FactoryGirl.create(:user) }
+  let(:user) { FactoryBot.create(:user) }
 
   before do
     sign_in user
@@ -34,16 +34,16 @@ RSpec.describe Hyrax::PagesController, type: :controller do
   end
   context 'when editing pages' do
     let!(:about_page) do
-      FactoryGirl.create(:content_block, name: 'about_page')
+      FactoryBot.create(:content_block, name: 'about_page')
     end
     let!(:help_page) do
-      FactoryGirl.create(:content_block, name: 'help_page')
+      FactoryBot.create(:content_block, name: 'help_page')
     end
     let!(:agreement_page) do
-      FactoryGirl.create(:content_block, name: 'agreement_page')
+      FactoryBot.create(:content_block, name: 'agreement_page')
     end
     let!(:terms_page) do
-      FactoryGirl.create(:content_block, name: 'terms_page')
+      FactoryBot.create(:content_block, name: 'terms_page')
     end
 
     context 'with an unprivileged user' do
@@ -63,7 +63,7 @@ RSpec.describe Hyrax::PagesController, type: :controller do
     end
 
     context 'with an administrator' do
-      let(:user) { FactoryGirl.create(:admin) }
+      let(:user) { FactoryBot.create(:admin) }
 
       describe "GET #edit" do
         it "renders breadcrumbs and dashboard layout" do

data/spec/controllers/hyrax/users_controller_spec.rb

@@ -81,7 +81,7 @@ RSpec.describe Hyrax::UsersController, type: :controller do
       end
 
       it "uses the base query" do
-        u3 = FactoryGirl.create(:user)
+        u3 = FactoryBot.create(:user)
         allow(controller).to receive(:base_query).and_return(["email == \"#{u3.email}\""])
         get :index
         expect(assigns[:users]).to include(u3)

data/spec/controllers/hyrax/workflow_actions_controller_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe Hyrax::WorkflowActionsController, type: :controller do
-  let(:user) { FactoryGirl.create(:user) }
+  let(:user) { FactoryBot.create(:user) }
   let(:generic_work) { stub_model(GenericWork, id: '123') }
   let(:form) { instance_double(Hyrax::Forms::WorkflowActionForm) }
 

data/spec/conversions/power_converters/polymorphic_type_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe 'PowerConverter', no_clean: true do
       expect(PowerConverter.convert_to_polymorphic_type(object)).to eq(:symbol)
     end
     it 'will convert an ActiveRecord::Base object' do
-      user = FactoryGirl.build(:user)
+      user = FactoryBot.build(:user)
       expect(PowerConverter.convert_to_polymorphic_type(user)).to eq(user.class)
     end
     it 'will convert an object that responds to #base_class' do

data/spec/factories/admin_sets.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :admin_set do
     sequence(:title) { |n| ["Title #{n}"] }
 

data/spec/factories/api_items.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :post_item, class: Hash do
     skip_create
 

data/spec/factories/collections_factory.rb

@@ -1,7 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :collection do
     transient do
-      user { FactoryGirl.create(:user) }
+      user { FactoryBot.create(:user) }
     end
     sequence(:title) { |n| ["Title #{n}"] }
 

data/spec/factories/content_blocks.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :content_block do |_cb|
   end
 end

data/spec/factories/featured_works.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :featured_work do |_u|
   end
 end

data/spec/factories/file_sets.rb

@@ -1,7 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :file_set do
     transient do
-      user { FactoryGirl.create(:user) }
+      user { FactoryBot.create(:user) }
       content nil
     end
     after(:build) do |fs, evaluator|
@@ -30,7 +30,7 @@ FactoryGirl.define do
         if evaluator.content
           Hydra::Works::UploadFileToFileSet.call(file, evaluator.content)
         end
-        FactoryGirl.create(:generic_work, user: evaluator.user).members << file
+        FactoryBot.create(:generic_work, user: evaluator.user).members << file
       end
     end
   end

data/spec/factories/generic_works.rb

@@ -1,7 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :work, aliases: [:generic_work, :private_generic_work], class: GenericWork do
     transient do
-      user { FactoryGirl.create(:user) }
+      user { FactoryBot.create(:user) }
       # Set to true (or a hash) if you want to create an admin set
       with_admin_set false
     end
@@ -37,45 +37,45 @@ FactoryGirl.define do
 
     factory :work_with_one_file do
       before(:create) do |work, evaluator|
-        work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user, title: ['A Contained FileSet'], label: 'filename.pdf')
+        work.ordered_members << FactoryBot.create(:file_set, user: evaluator.user, title: ['A Contained FileSet'], label: 'filename.pdf')
       end
     end
 
     factory :work_with_files do
-      before(:create) { |work, evaluator| 2.times { work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user) } }
+      before(:create) { |work, evaluator| 2.times { work.ordered_members << FactoryBot.create(:file_set, user: evaluator.user) } }
     end
 
     factory :work_with_ordered_files do
       before(:create) do |work, evaluator|
-        work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user)
-        work.ordered_member_proxies.insert_target_at(0, FactoryGirl.create(:file_set, user: evaluator.user))
+        work.ordered_members << FactoryBot.create(:file_set, user: evaluator.user)
+        work.ordered_member_proxies.insert_target_at(0, FactoryBot.create(:file_set, user: evaluator.user))
       end
     end
 
     factory :work_with_one_child do
       before(:create) do |work, evaluator|
-        work.ordered_members << FactoryGirl.create(:generic_work, user: evaluator.user, title: ['A Contained Work'])
+        work.ordered_members << FactoryBot.create(:generic_work, user: evaluator.user, title: ['A Contained Work'])
       end
     end
 
     factory :work_with_two_children do
       before(:create) do |work, evaluator|
-        work.ordered_members << FactoryGirl.create(:generic_work, user: evaluator.user, title: ['A Contained Work'], id: "BlahBlah1")
-        work.ordered_members << FactoryGirl.create(:generic_work, user: evaluator.user, title: ['Another Contained Work'], id: "BlahBlah2")
+        work.ordered_members << FactoryBot.create(:generic_work, user: evaluator.user, title: ['A Contained Work'], id: "BlahBlah1")
+        work.ordered_members << FactoryBot.create(:generic_work, user: evaluator.user, title: ['Another Contained Work'], id: "BlahBlah2")
       end
     end
 
     factory :work_with_representative_file do
       before(:create) do |work, evaluator|
-        work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user, title: ['A Contained FileSet'])
+        work.ordered_members << FactoryBot.create(:file_set, user: evaluator.user, title: ['A Contained FileSet'])
         work.representative_id = work.members[0].id
       end
     end
 
     factory :work_with_file_and_work do
       before(:create) do |work, evaluator|
-        work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user)
-        work.ordered_members << FactoryGirl.create(:generic_work, user: evaluator.user)
+        work.ordered_members << FactoryBot.create(:file_set, user: evaluator.user)
+        work.ordered_members << FactoryBot.create(:generic_work, user: evaluator.user)
       end
     end
 
@@ -90,7 +90,7 @@ FactoryGirl.define do
       end
       factory :embargoed_work_with_files do
         after(:build) { |work, evaluator| work.apply_embargo(evaluator.embargo_date, evaluator.current_state, evaluator.future_state) }
-        after(:create) { |work, evaluator| 2.times { work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user) } }
+        after(:create) { |work, evaluator| 2.times { work.ordered_members << FactoryBot.create(:file_set, user: evaluator.user) } }
       end
     end
 
@@ -105,7 +105,7 @@ FactoryGirl.define do
       end
       factory :leased_work_with_files do
         after(:build) { |work, evaluator| work.apply_lease(evaluator.lease_date, evaluator.current_state, evaluator.future_state) }
-        after(:create) { |work, evaluator| 2.times { work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user) } }
+        after(:create) { |work, evaluator| 2.times { work.ordered_members << FactoryBot.create(:file_set, user: evaluator.user) } }
       end
     end
   end
@@ -113,6 +113,6 @@ FactoryGirl.define do
   # Doesn't set up any edit_users
   factory :work_without_access, class: GenericWork do
     title ['Test title']
-    depositor { FactoryGirl.create(:user).user_key }
+    depositor { FactoryBot.create(:user).user_key }
   end
 end

data/spec/factories/operations.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :operation, class: Hyrax::Operation do
     operation_type "Test operation"
 

data/spec/factories/permission_template_accesses.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :permission_template_access, class: Hyrax::PermissionTemplateAccess do
     permission_template
     trait :manage do

data/spec/factories/permission_templates.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :permission_template, class: Hyrax::PermissionTemplate do
     # Given that there is a one to one strong relation between permission_template and admin_set,
     # with a unique index on the admin_set_id, I don't want to have duplication in admin_set_id

data/spec/factories/proxy_deposit_requests.rb

@@ -1,6 +1,6 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :proxy_deposit_request do
   end
 end

data/spec/factories/single_use_links.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :single_use_link do
     factory :show_link do
       itemId 'fs-id'

data/spec/factories/sipity_entities.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :sipity_entity, class: Sipity::Entity do
     proxy_for_global_id 'gid://internal/Mock/1'
     workflow { workflow_state.workflow }

data/spec/factories/uploaded_files.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :uploaded_file, class: Hyrax::UploadedFile do
     user
   end

data/spec/factories/users.rb

@@ -1,11 +1,11 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user do
     sequence(:email) { |n| "user#{n}@example.com" }
     password 'password'
 
     transient do
       # Allow for custom groups when a user is instantiated.
-      # @example FactoryGirl.create(:user, groups: 'avacado')
+      # @example FactoryBot.create(:user, groups: 'avacado')
       groups []
     end
 

data/spec/factories/workflow_actions.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :workflow_action, class: Sipity::WorkflowAction do
     workflow
     name 'submit'

data/spec/factories/workflow_states.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :workflow_state, class: Sipity::WorkflowState do
     workflow
     name 'initial'

data/spec/factories/workflows.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :workflow, class: Sipity::Workflow do
     sequence(:name) { |n| "generic_work-#{n}" }
     permission_template

data/spec/features/notifications_spec.rb

@@ -1,6 +1,6 @@
 RSpec.feature "Notifications page", type: :feature do
   before do
-    sign_in FactoryGirl.create(:user_with_mail)
+    sign_in FactoryBot.create(:user_with_mail)
     visit "/notifications"
   end
 

data/spec/forms/hyrax/forms/permission_template_form_spec.rb

@@ -17,6 +17,111 @@ RSpec.describe Hyrax::Forms::PermissionTemplateForm do
     expect(form.workflow_id).to eq(workflow.id)
   end
 
+  describe 'integration tests' do
+    let(:permission_template) { create(:permission_template, with_admin_set: true, with_workflows: true) }
+
+    subject do
+      form.update(
+        ActionController::Parameters.new(
+          access_grants_attributes: [
+            ActionController::Parameters.new(agent_type: "user",
+                                             agent_id: user.user_key,
+                                             access: access_level).permit!
+          ]
+        ).permit!
+      )
+    end
+
+    before do
+      # Create MANAGING role manually
+      Sipity::Role[Hyrax::RoleRegistry::MANAGING]
+    end
+
+    def count_template_accesses_for(user, access_level)
+      Hyrax::PermissionTemplateAccess.where(
+        agent_id: user.user_key,
+        access: access_level
+      ).count
+    end
+
+    def count_workflow_responsibilities_for(user)
+      Sipity::WorkflowResponsibility.where(agent: user.to_sipity_agent).count
+    end
+
+    it 'starts with no PTAs' do
+      expect(permission_template.access_grants).to be_empty
+    end
+
+    context 'with manager users' do
+      let(:user) { create(:user) }
+      let(:access_level) { 'manage' }
+
+      it 'adds the expected permission template accesses and workflow responsibilities' do
+        expect { subject }.to change {
+          count_template_accesses_for(user, access_level)
+        }.from(0).to(1).and change {
+          count_workflow_responsibilities_for(user)
+        }.from(0).to(6)
+      end
+
+      it 'removes workflow responsibilities' do
+        subject
+        expect do
+          form.remove_access!(
+            permission_template.access_grants.find_by(agent_id: user.user_key, access: access_level)
+          )
+        end.to change { count_workflow_responsibilities_for(user) }
+          .from(6).to(0)
+      end
+    end
+
+    context 'with depositor users' do
+      let(:user) { create(:user) }
+      let(:access_level) { 'deposit' }
+
+      it 'adds the expected permission template accesses and workflow responsibilities' do
+        expect { subject }.to change {
+          count_template_accesses_for(user, access_level)
+        }.from(0).to(1).and change {
+          count_workflow_responsibilities_for(user)
+        }.from(0).to(2)
+      end
+
+      it 'removes workflow responsibilities' do
+        subject
+        expect do
+          form.remove_access!(
+            permission_template.access_grants.find_by(agent_id: user.user_key, access: access_level)
+          )
+        end.to change { count_workflow_responsibilities_for(user) }
+          .from(2).to(0)
+      end
+    end
+
+    context 'with viewer users' do
+      let(:user) { create(:user) }
+      let(:access_level) { 'view' }
+
+      it 'adds the expected permission template accesses and workflow responsibilities' do
+        expect { subject }.to change {
+          count_template_accesses_for(user, access_level)
+        }.from(0).to(1).and change {
+          count_workflow_responsibilities_for(user)
+        }.by(0)
+      end
+
+      it 'does nothing (yet)' do
+        subject
+        expect do
+          form.remove_access!(
+            permission_template.access_grants.find_by(agent_id: user.user_key, access: access_level)
+          )
+        end.to change { count_workflow_responsibilities_for(user) }
+          .by(0)
+      end
+    end
+  end
+
   describe "#update" do
     subject { form.update(input_params) }
 
@@ -234,7 +339,10 @@ RSpec.describe Hyrax::Forms::PermissionTemplateForm do
   end
 
   describe "#grant_workflow_roles" do
-    subject { form.send(:grant_workflow_roles, attributes) }
+    subject do
+      form.attributes = attributes
+      form.send(:grant_workflow_roles)
+    end
 
     let(:attributes) { { workflow_id: workflow.id } }
     let(:workflow) { create(:workflow, permission_template: permission_template, active: true) }
@@ -428,7 +536,10 @@ RSpec.describe Hyrax::Forms::PermissionTemplateForm do
   describe "#permission_template_update_params" do
     let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id) }
 
-    subject { form.send(:permission_template_update_params, input_params) }
+    subject do
+      form.attributes = input_params
+      form.send(:permission_template_update_params)
+    end
 
     context "with release varies by date selected" do
       let(:input_params) do