From 7e544a9ae9eec428061c401e4f03b39ae2f75dd6 Mon Sep 17 00:00:00 2001 From: Ayoub Belemlih <13107510+abelemlih@users.noreply.github.com> Date: Fri, 8 Dec 2023 16:20:48 -0600 Subject: [PATCH 1/3] Edit edit_file_spec.rb --- spec/features/edit_file_spec.rb | 48 +++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/spec/features/edit_file_spec.rb b/spec/features/edit_file_spec.rb index 5e90ca1caf..a5478b41e9 100644 --- a/spec/features/edit_file_spec.rb +++ b/spec/features/edit_file_spec.rb @@ -1,19 +1,43 @@ # frozen_string_literal: true RSpec.describe "Editing a file:", type: :feature do let(:user) { create(:user) } - let(:admin_set) { create(:admin_set) } let(:permission_template) { create(:permission_template, source_id: admin_set.id) } let!(:workflow) { create(:workflow, allows_access_grant: true, active: true, permission_template_id: permission_template.id) } - let(:file_title) { 'Some kind of title' } - let(:work) { build(:work, user: user, admin_set_id: admin_set.id) } - let(:file_set) { create(:file_set, user: user, title: [file_title]) } + + let(:admin_set) do + if Hyrax.config.use_valkyrie? + valkyrie_create(:hyrax_admin_set) + else + create(:admin_set) + end + end + + let!(:work) do + if Hyrax.config.use_valkyrie? + valkyrie_create(:monograph, depositor: user.user_key, admin_set_id: admin_set.id, members: [file_set]) + else + build(:work, user: user, admin_set_id: admin_set.id) + end + end + + let(:file_set) do + if Hyrax.config.use_valkyrie? + valkyrie_create(:hyrax_file_set, :with_files, title: ['Test File Set'], depositor: user.user_key, read_groups: ['public'], edit_users: [user]) + else + create(:file_set, :with_original_file, title: ['Test File Set'], user: user, read_groups: ['public'], edit_users: [user]) + end + end + let(:file) { File.open(fixture_path + '/world.png') } before do sign_in user - Hydra::Works::AddFileToFileSet.call(file_set, file, :original_file) - work.ordered_members << file_set - work.save! + + unless Hyrax.config.use_valkyrie? + Hydra::Works::AddFileToFileSet.call(file_set, file, :original_file) + work.ordered_members << file_set + work.save! + end end context 'when the user tries to update file content, but forgets to select a file:' do @@ -21,13 +45,12 @@ visit edit_hyrax_file_set_path(file_set) click_link 'Versions' click_button 'Upload New Version' - expect(page).to have_content "Edit #{file_title}" + expect(page).to have_content 'There was a problem processing your request.' + expect(page).to have_content "Edit #{file_set}" end end context 'when the user tries to update permissions' do - let(:file_set) { create(:file_set, user: user, title: [file_title], read_groups: ['public']) } - it 'successfully update visibility' do visit edit_hyrax_file_set_path(file_set) click_link 'Permissions' @@ -35,10 +58,7 @@ expect(find('#file_set_visibility_open').checked?).to be(true) find('#file_set_visibility_authenticated').click - within "#permission" do - click_button 'Save' - end - + find_button('update_permission').click expect(page).to have_css('span.badge.badge-info', text: 'Institution') end end From 8ef8b490d2cd815dbfc203a3c04d4d85e2780849 Mon Sep 17 00:00:00 2001 From: Ayoub Belemlih <13107510+abelemlih@users.noreply.github.com> Date: Fri, 8 Dec 2023 16:24:46 -0600 Subject: [PATCH 2/3] Edit edit_file_spec.rb --- spec/features/edit_file_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/features/edit_file_spec.rb b/spec/features/edit_file_spec.rb index a5478b41e9..de554ccd0a 100644 --- a/spec/features/edit_file_spec.rb +++ b/spec/features/edit_file_spec.rb @@ -24,7 +24,7 @@ if Hyrax.config.use_valkyrie? valkyrie_create(:hyrax_file_set, :with_files, title: ['Test File Set'], depositor: user.user_key, read_groups: ['public'], edit_users: [user]) else - create(:file_set, :with_original_file, title: ['Test File Set'], user: user, read_groups: ['public'], edit_users: [user]) + create(:file_set, title: ['Test File Set'], user: user, read_groups: ['public'], edit_users: [user]) end end From becad3b048ae9c861d0f6455f6a2a388d342c27c Mon Sep 17 00:00:00 2001 From: Ayoub Belemlih <13107510+abelemlih@users.noreply.github.com> Date: Mon, 11 Dec 2023 12:01:50 -0600 Subject: [PATCH 3/3] Edit edit_file_spec.rb --- spec/features/edit_file_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/features/edit_file_spec.rb b/spec/features/edit_file_spec.rb index de554ccd0a..870c2c836b 100644 --- a/spec/features/edit_file_spec.rb +++ b/spec/features/edit_file_spec.rb @@ -5,7 +5,7 @@ let!(:workflow) { create(:workflow, allows_access_grant: true, active: true, permission_template_id: permission_template.id) } let(:admin_set) do - if Hyrax.config.use_valkyrie? + if Hyrax.config.disable_wings valkyrie_create(:hyrax_admin_set) else create(:admin_set) @@ -13,7 +13,7 @@ end let!(:work) do - if Hyrax.config.use_valkyrie? + if Hyrax.config.disable_wings valkyrie_create(:monograph, depositor: user.user_key, admin_set_id: admin_set.id, members: [file_set]) else build(:work, user: user, admin_set_id: admin_set.id) @@ -21,7 +21,7 @@ end let(:file_set) do - if Hyrax.config.use_valkyrie? + if Hyrax.config.disable_wings valkyrie_create(:hyrax_file_set, :with_files, title: ['Test File Set'], depositor: user.user_key, read_groups: ['public'], edit_users: [user]) else create(:file_set, title: ['Test File Set'], user: user, read_groups: ['public'], edit_users: [user]) @@ -33,7 +33,7 @@ before do sign_in user - unless Hyrax.config.use_valkyrie? + unless Hyrax.config.disable_wings Hydra::Works::AddFileToFileSet.call(file_set, file, :original_file) work.ordered_members << file_set work.save!