Fixed license & bulkrax tests*

lib/tasks/ingest_bulkrax_prep.rake

@@ -144,11 +144,7 @@ namespace :gwss do
       work_metadata['date_created'] = etd_date_created unless etd_date_created.nil?
       work_metadata['committee_member'] = get_committee_members(doc).join(';')
       work_metadata['rights_statement'] = 'http://rightsstatements.org/vocab/InC/1.0/'
-      # Can't currently load this license because this Bulkrax code
-      # https://github.com/samvera/bulkrax/blob/v8.1.0/app/models/concerns/bulkrax/import_behavior.rb#L145-L146
-      # will try to match it with http://www.europeana.eu/portal/rights/rr-r.html/ (slash-terminated)
-      # -- not finding a match, Bulkrax will throw an error.
-      # work_metadata['license'] = 'http://www.europeana.eu/portal/rights/rr-r.html'
+      work_metadata['license'] = 'All rights reserved'
       work_metadata
     end
 

spec/factories/gw_works.rb

@@ -20,7 +20,11 @@
       end
     end
 
-    after(:create) do |work, _evaluator|
+    after(:create) do |work, options|
+    # Add the user's ability to the work -> necessary for enabling access to Edit pages
+      actor = Hyrax::CurationConcern.actor
+      actor_environment = Hyrax::Actors::Environment.new(work, Ability.new(options.user), {})
+      actor.create(actor_environment)
       work.save! if work.try(:member_of_collections) && work.member_of_collections.present?
     end
 

spec/features/bulkrax_upload_spec.rb

@@ -34,10 +34,10 @@
     csv_rows = CSV.read("#{@temp_dir}/metadata.csv")
 
     headers_arr = csv_rows[0]
-
+    print headers_arr
     expect(headers_arr).to eq(["model", "title", "creator", "contributor", "language",
                                "description", "keyword", "degree", "resource_type", "advisor", "gw_affiliation",
-                               "date_created", "committee_member", "rights_statement", "bulkrax_identifier",
+                               "date_created", "committee_member", "rights_statement", "license", "bulkrax_identifier",
                                "file", "parents", "visibility", "visibility_during_embargo",
                                "visibility_after_embargo", "embargo_release_date"])
 

spec/features/license_spec.rb

@@ -5,11 +5,10 @@
   let(:solr) { Blacklight.default_index.connection }
   let(:admin_set) { FactoryBot.create(:admin_set) }
 
-  let(:content_admin_user) { FactoryBot.create(:content_admin_user) }
+  let(:content_admin_user) { FactoryBot.create(:content_admin) }
 
-  let(:work_with_license) { FactoryBot.create(:gw_work, 
+  let(:work_with_license) { FactoryBot.create(:public_work, 
                                         admin_set: admin_set, 
-                                        visibility: "public",
                                         user: content_admin_user) }
 
   let(:another_license_value) { Hyrax::QaSelectService.new('licenses').select_active_options.first.first }
@@ -35,7 +34,7 @@
             expect(page).to have_content(work_with_license.license.first)
         end
     end
-=begin    context 'as a content-admin user' do
+    context 'as a content-admin user' do
         before :each do
           sign_in_user(content_admin_user)
         end
@@ -44,12 +43,8 @@
           visit "/concern/gw_works/#{work_with_license.id}/edit"
           page.select another_license_value, :from => "gw_work_license"
           page.click_on("Save changes")
-        end
-
-        it 'can see the changes' do
-          visit "/concern/gw_works/#{work_with_license.id}"
           expect(page).to have_content(another_license_value)
         end
     end
-=end
+
 end