hyrax 2.4.1 → 2.5.0

data/spec/search_builders/hyrax/dashboard/nested_collections_search_builder_spec.rb

@@ -61,7 +61,7 @@ RSpec.describe Hyrax::Dashboard::NestedCollectionsSearchBuilder do
 
     context 'when access is :deposit' do
       let(:access) { "deposit" }
-      let!(:collection) { create(:collection, with_permission_template: attributes) }
+      let!(:collection) { create(:collection_lw, with_permission_template: attributes) }
 
       context 'and user has access' do
         let(:attributes) { { deposit_users: [user.user_key] } }

data/spec/search_builders/hyrax/work_relation_spec.rb

@@ -1,7 +1,7 @@
 RSpec.describe Hyrax::WorkRelation, :clean_repo do
   let!(:work) { create(:generic_work) }
   let!(:file_set) { create(:file_set) }
-  let!(:collection) { create(:collection) }
+  let!(:collection) { build(:collection_lw) }
 
   it 'has works and not collections or file sets' do
     expect(subject).to eq [work]

data/spec/services/hyrax/adapters/nesting_index_adapter_spec.rb

@@ -64,8 +64,8 @@ RSpec.describe Hyrax::Adapters::NestingIndexAdapter do
   end
 
   describe '.each_perservation_document_id_and_parent_ids', clean_repo: true do
-    let!(:nested_parent) { create(:collection, member_of_collections: []) }
-    let!(:nested_with_parent) { create(:collection, member_of_collections: [nested_parent]) }
+    let!(:nested_parent) { build(:collection_lw, member_of_collections: []) }
+    let!(:nested_with_parent) { create(:collection_lw, member_of_collections: [nested_parent]) }
     let!(:work) { create(:generic_work) }
     let(:count_of_items) { ActiveFedora::Base.descendant_uris(ActiveFedora.fedora.base_uri, exclude_uri: true).count }
 

data/spec/services/hyrax/collections/collection_member_service_spec.rb

@@ -2,9 +2,9 @@ RSpec.describe Hyrax::Collections::CollectionMemberService, clean_repo: true do
   let(:blacklight_config) { CatalogController.blacklight_config }
   let(:repository) { Blacklight::Solr::Repository.new(blacklight_config) }
   let(:current_ability) { instance_double(Ability, admin?: true) }
-  let!(:nestable_collection) { create(:public_collection, collection_type_settings: [:nestable]) }
+  let!(:nestable_collection) { create(:public_collection_lw, collection_type_settings: [:nestable]) }
   let(:scope) { double('Scope', current_ability: current_ability, repository: repository, blacklight_config: blacklight_config, collection: nestable_collection) }
-  let!(:subcollection) { create(:public_collection, member_of_collections: [nestable_collection], collection_type_settings: [:nestable]) }
+  let!(:subcollection) { create(:public_collection_lw, member_of_collections: [nestable_collection], collection_type_settings: [:nestable]) }
   let(:builder) { described_class.new(scope: scope, collection: nestable_collection, params: { "id" => nestable_collection.id.to_s }) }
 
   let!(:work1) { create(:generic_work, member_of_collections: [nestable_collection]) }

data/spec/services/hyrax/collections/migration_service_spec.rb

@@ -14,11 +14,11 @@ RSpec.describe Hyrax::Collections::MigrationService, clean_repo: true do
 
   describe ".migrate_all_collections" do
     context 'when legacy collections are found (e.g. collections created before Hyrax 2.1.0)' do
-      let!(:col_none) { build(:typeless_collection, id: 'col_none', user: user, edit_users: [user.user_key], do_save: true) }
-      let!(:col_vu) { build(:typeless_collection, id: 'col_vu', user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key], do_save: true) }
-      let!(:col_vg) { build(:typeless_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group_1', 'read_group_2'], do_save: true) }
-      let!(:col_mu) { build(:typeless_collection, id: 'col_mu', user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key], do_save: true) }
-      let!(:col_mg) { build(:typeless_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'], do_save: true) }
+      let!(:col_none) { build(:typeless_collection, user: user, edit_users: [user.user_key], do_save: true) }
+      let!(:col_vu) { build(:typeless_collection, user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key], do_save: true) }
+      let!(:col_vg) { build(:typeless_collection, user: user, edit_users: [user.user_key], read_groups: ['read_group_1', 'read_group_2'], do_save: true) }
+      let!(:col_mu) { build(:typeless_collection, user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key], do_save: true) }
+      let!(:col_mg) { build(:typeless_collection, user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'], do_save: true) }
 
       it 'sets gid and adds permissions' do # rubocop:disable RSpec/ExampleLength
         Collection.all.each do |col|
@@ -158,11 +158,11 @@ RSpec.describe Hyrax::Collections::MigrationService, clean_repo: true do
       let!(:col_mg) { build(:typeless_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'], do_save: true) }
 
       context "and collection wasn't migrated at all" do
-        let!(:col_none) { build(:typeless_collection, id: 'col_none', user: user, edit_users: [user.user_key], do_save: true) }
-        let!(:col_vu) { build(:typeless_collection, id: 'col_vu', user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key], do_save: true) }
-        let!(:col_vg) { build(:typeless_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group_1', 'read_group_2'], do_save: true) }
-        let!(:col_mu) { build(:typeless_collection, id: 'col_mu', user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key], do_save: true) }
-        let!(:col_mg) { build(:typeless_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'], do_save: true) }
+        let!(:col_none) { build(:typeless_collection_lw, user: user, edit_users: [user.user_key], read_users: [], do_save: true) }
+        let!(:col_vu) { build(:typeless_collection_lw, user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key], do_save: true) }
+        let!(:col_vg) { build(:typeless_collection_lw, user: user, edit_users: [user.user_key], read_groups: ['read_group_1', 'read_group_2'], do_save: true) }
+        let!(:col_mu) { build(:typeless_collection_lw, user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key], do_save: true) }
+        let!(:col_mg) { build(:typeless_collection_lw, user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'], do_save: true) }
 
         it 'sets gid and adds permissions' do # rubocop:disable RSpec/ExampleLength
           Collection.all.each do |col|
@@ -185,11 +185,11 @@ RSpec.describe Hyrax::Collections::MigrationService, clean_repo: true do
       end
 
       context "and collection type gid is set but permission template doesn't exist" do
-        let!(:col_none) { create(:user_collection, id: 'col_none', user: user, edit_users: [user.user_key], collection_type_gid: default_gid) }
-        let!(:col_vu) { create(:user_collection, id: 'col_vu', user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key], collection_type_gid: default_gid) }
-        let!(:col_vg) { create(:user_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group_1', 'read_group_2'], collection_type_gid: default_gid) }
-        let!(:col_mu) { create(:user_collection, id: 'col_mu', user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key], collection_type_gid: default_gid) }
-        let!(:col_mg) { create(:user_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'], collection_type_gid: default_gid) }
+        let!(:col_none) { build(:user_collection_lw, id: 'col_none', user: user, edit_users: [user.user_key], collection_type_gid: default_gid) }
+        let!(:col_vu) { build(:user_collection_lw, id: 'col_vu', user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key], collection_type_gid: default_gid) }
+        let!(:col_vg) { build(:user_collection_lw, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group_1', 'read_group_2'], collection_type_gid: default_gid) }
+        let!(:col_mu) { build(:user_collection_lw, id: 'col_mu', user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key], collection_type_gid: default_gid) }
+        let!(:col_mg) { build(:user_collection_lw, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'], collection_type_gid: default_gid) }
 
         it 'sets gid and adds permissions' do # rubocop:disable RSpec/ExampleLength
           Collection.all.each do |col|
@@ -212,21 +212,21 @@ RSpec.describe Hyrax::Collections::MigrationService, clean_repo: true do
       end
 
       context "and collection type gid isn't set but permission template exists with access set" do
-        let!(:col_none) { build(:typeless_collection, id: 'col_none', user: user, edit_users: [user.user_key], do_save: true, with_permission_template: true) }
+        let!(:col_none) { build(:typeless_collection, user: user, edit_users: [user.user_key], do_save: true, with_permission_template: true) }
         let!(:col_vu) do
-          build(:typeless_collection, id: 'col_vu', user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key],
+          build(:typeless_collection, user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key],
                                       do_save: true, with_permission_template: true)
         end
         let!(:col_vg) do
-          build(:typeless_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group_1', 'read_group_2'],
+          build(:typeless_collection, user: user, edit_users: [user.user_key], read_groups: ['read_group_1', 'read_group_2'],
                                       do_save: true, with_permission_template: true)
         end
         let!(:col_mu) do
-          build(:typeless_collection, id: 'col_mu', user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key],
+          build(:typeless_collection, user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key],
                                       do_save: true, with_permission_template: true)
         end
         let!(:col_mg) do
-          build(:typeless_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'],
+          build(:typeless_collection, user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'],
                                       do_save: true, with_permission_template: true)
         end
 
@@ -276,21 +276,21 @@ RSpec.describe Hyrax::Collections::MigrationService, clean_repo: true do
       end
 
       context "and collection type gid isn't set and permission template exists with access not set" do
-        let!(:col_none) { build(:typeless_collection, id: 'col_none', user: user, edit_users: [user.user_key], do_save: true, with_permission_template: true) }
+        let!(:col_none) { build(:typeless_collection, user: user, edit_users: [user.user_key], do_save: true, with_permission_template: true) }
         let!(:col_vu) do
-          build(:typeless_collection, id: 'col_vu', user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key],
+          build(:typeless_collection, user: user, edit_users: [user.user_key], read_users: [reader1.user_key, reader2.user_key],
                                       do_save: true, with_permission_template: true)
         end
         let!(:col_vg) do
-          build(:typeless_collection, id: 'col_vg', user: user, edit_users: [user.user_key], read_groups: ['read_group_1', 'read_group_2'],
+          build(:typeless_collection, user: user, edit_users: [user.user_key], read_groups: ['read_group_1', 'read_group_2'],
                                       do_save: true, with_permission_template: true)
         end
         let!(:col_mu) do
-          build(:typeless_collection, id: 'col_mu', user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key],
+          build(:typeless_collection, user: user, edit_users: [user.user_key, editor1.user_key, editor2.user_key],
                                       do_save: true, with_permission_template: true)
         end
         let!(:col_mg) do
-          build(:typeless_collection, id: 'col_mg', user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'],
+          build(:typeless_collection, user: user, edit_users: [user.user_key], edit_groups: ['edit_group_1', 'edit_group_2'],
                                       do_save: true, with_permission_template: true)
         end
 
@@ -322,8 +322,8 @@ RSpec.describe Hyrax::Collections::MigrationService, clean_repo: true do
 
     context 'when newer collections are found (e.g. collections created at or after Hyrax 2.1.0)' do
       let!(:collection) do
-        create(:collection, id: 'col_newer', user: user, with_permission_template: true, collection_type_settings: [:discoverable],
-                            edit_users: [user.user_key], create_access: true)
+        build(:collection_lw, id: 'col_newer', user: user, with_permission_template: true, collection_type_settings: [:discoverable],
+                              edit_users: [user.user_key])
       end
       let!(:permission_template) { collection.permission_template }
       let!(:collection_type_gid) { collection.collection_type_gid }

data/spec/services/hyrax/collections/nested_collection_persistence_service_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe Hyrax::Collections::NestedCollectionPersistenceService, with_nested_reindexing: true do
-  let(:parent) { create(:collection) }
+  let(:parent) { build(:collection_lw) }
   let(:child) { create(:collection) }
 
   describe '.persist_nested_collection_for' do

data/spec/services/hyrax/collections/nested_collection_query_service_spec.rb

@@ -153,57 +153,57 @@ RSpec.describe Hyrax::Collections::NestedCollectionQueryService, clean_repo: tru
 
         # using create option here because permission template is required for testing :deposit access
         let(:coll_a) do
-          create(:public_collection,
-                 id: 'Collection_A',
-                 collection_type_gid: collection_type.gid,
-                 user: user,
-                 create_access: true)
+          build(:public_collection_lw,
+                id: 'Collection_A',
+                collection_type_gid: collection_type.gid,
+                user: user,
+                with_permission_template: true)
         end
         let(:coll_b) do
-          create(:public_collection,
-                 id: 'Collection_B',
-                 collection_type_gid: collection_type.gid,
-                 user: user,
-                 create_access: true,
-                 member_of_collections: [coll_a])
+          build(:public_collection_lw,
+                id: 'Collection_B',
+                collection_type_gid: collection_type.gid,
+                user: user,
+                with_permission_template: true,
+                member_of_collections: [coll_a])
         end
         let(:coll_c) do
-          create(:public_collection,
-                 id: 'Collection_C',
-                 collection_type_gid: collection_type.gid,
-                 user: user,
-                 create_access: true,
-                 member_of_collections: [coll_b])
+          build(:public_collection_lw,
+                id: 'Collection_C',
+                collection_type_gid: collection_type.gid,
+                user: user,
+                with_permission_template: true,
+                member_of_collections: [coll_b])
         end
         let(:coll_d) do
-          create(:public_collection,
-                 id: 'Collection_D',
-                 collection_type_gid: collection_type.gid,
-                 user: user,
-                 create_access: true,
-                 member_of_collections: [coll_c])
+          build(:public_collection_lw,
+                id: 'Collection_D',
+                collection_type_gid: collection_type.gid,
+                user: user,
+                with_permission_template: true,
+                member_of_collections: [coll_c])
         end
         let(:coll_e) do
-          create(:public_collection,
+          create(:public_collection_lw,
                  id: 'Collection_E',
                  collection_type_gid: collection_type.gid,
                  user: user,
-                 create_access: true,
+                 with_permission_template: true,
                  member_of_collections: [coll_d])
         end
         let(:another) do
-          create(:public_collection,
+          create(:public_collection_lw,
                  id: 'Another_One',
                  collection_type_gid: collection_type.gid,
                  user: user,
-                 create_access: true)
+                 with_permission_template: true)
         end
         let(:wrong) do
-          create(:public_collection,
-                 id: 'Wrong_Type',
-                 collection_type_gid: another_collection_type.gid,
-                 user: user,
-                 create_access: true)
+          build(:public_collection_lw,
+                id: 'Wrong_Type',
+                collection_type_gid: another_collection_type.gid,
+                user: user,
+                with_permission_template: true)
         end
 
         before do
@@ -245,18 +245,18 @@ RSpec.describe Hyrax::Collections::NestedCollectionQueryService, clean_repo: tru
       describe 'and are of the same collection type', with_nested_reindexing: true do
         # using create option here because permission template is required for testing :deposit access
         let!(:parent) do
-          create(:public_collection,
+          create(:public_collection_lw,
                  id: 'Parent_Collecton',
                  collection_type_gid: collection_type.gid,
                  user: user,
-                 create_access: true)
+                 with_permission_template: true)
         end
         let!(:child) do
-          create(:public_collection,
+          create(:public_collection_lw,
                  id: 'Child_Collection',
                  collection_type_gid: collection_type.gid,
                  user: user,
-                 create_access: true)
+                 with_permission_template: true)
         end
 
         it { is_expected.to eq(true) }
@@ -325,8 +325,8 @@ RSpec.describe Hyrax::Collections::NestedCollectionQueryService, clean_repo: tru
 
   describe 'nesting attributes object', with_nested_reindexing: true do
     let(:user) { create(:user) }
-    let!(:parent) { create(:collection, id: 'Parent_Coll', collection_type_gid: collection_type.gid, user: user) }
-    let!(:child) { create(:user_collection, id: 'Child_Coll', collection_type_gid: collection_type.gid, user: user) }
+    let!(:parent) { build(:collection_lw, id: 'Parent_Coll', collection_type_gid: collection_type.gid, user: user) }
+    let!(:child) { create(:user_collection_lw, id: 'Child_Coll', collection_type_gid: collection_type.gid, user: user) }
     let(:nesting_attributes) { Hyrax::Collections::NestedCollectionQueryService::NestingAttributes.new(id: child.id, scope: scope) }
 
     before do

data/spec/services/hyrax/statistics/depositors/summary_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe Hyrax::Statistics::Depositors::Summary, :clean_repo do
   let(:end_date) { nil }
   let!(:work1) { create(:work, user: user1) }
   let!(:work2) { create(:work, user: user2) }
-  let!(:collection1) { create(:public_collection, user: user1) }
+  let!(:collection1) { create(:public_collection_lw, user: user1) }
   let(:service) { described_class.new(start_date, end_date) }
 
   before do

data/spec/services/hyrax/statistics/works/by_resource_type_spec.rb

@@ -1,12 +1,19 @@
 RSpec.describe Hyrax::Statistics::Works::ByResourceType do
   let(:service) { described_class.new }
+  let(:user) { create(:user) }
 
   describe "#query", :clean_repo do
     before do
-      create(:generic_work, resource_type: ['Conference Proceeding'])
-      create(:generic_work, resource_type: ['Conference Proceeding'])
-      create(:generic_work, resource_type: ['Image'])
-      create(:generic_work, resource_type: ['Journal'])
+      # Creating factories here led to failures found within
+      # https://travis-ci.org/samvera/hyrax/jobs/454752377
+      # One should be able to invoke create(:generic_work)...
+      # ...however, there are difficulties here which relate to the "terms"
+      # requestHandler
+      # @see https://github.com/samvera/hyrax/issues/3491
+      GenericWork.create(title: ['test'], resource_type: ['Conference Proceeding']).save!
+      GenericWork.create(title: ['test'], resource_type: ['Conference Proceeding']).save!
+      GenericWork.create(title: ['test'], resource_type: ['Image']).save!
+      GenericWork.create(title: ['test'], resource_type: ['Journal']).save!
     end
 
     subject { service.query }

data/spec/spec_helper.rb

@@ -40,6 +40,7 @@ require 'rspec/active_model/mocks'
 require 'capybara/rspec'
 require 'capybara/rails'
 require 'selenium-webdriver'
+require 'chromedriver-helper'
 require 'equivalent-xml'
 require 'equivalent-xml/rspec_matchers'
 require 'database_cleaner'
@@ -169,13 +170,6 @@ RSpec.configure do |config|
       DatabaseCleaner.start
     end
 
-    if example.metadata[:type] == :view
-      # View tests should not hit any services. This ensures the tests are unit
-      # testing only the views and run fast.
-      WebMock.disable_net_connect!(allow_localhost: false)
-    else
-      WebMock.disable_net_connect!(allow_localhost: true)
-    end
     # using :workflow is preferable to :clean_repo, use the former if possible
     # It's important that this comes after DatabaseCleaner.start
     ensure_deposit_available_for(user) if example.metadata[:workflow]
@@ -195,7 +189,15 @@ RSpec.configure do |config|
   end
 
   config.include(ControllerLevelHelpers, type: :view)
-  config.before(:each, type: :view) { initialize_controller_helpers(view) }
+
+  config.before(:each, type: :view) do
+    initialize_controller_helpers(view)
+    WebMock.disable_net_connect!(allow_localhost: false)
+  end
+
+  config.after(:each, type: :view) do
+    WebMock.disable_net_connect!(allow_localhost: true)
+  end
 
   config.before(:all, type: :feature) do
     # Assets take a long time to compile. This causes two problems:

data/spec/support/selectors.rb

@@ -43,7 +43,16 @@ module Selectors
     def select_member_of_collection(collection)
       find('#s2id_member_of_collection_ids').click
       find('.select2-input').set(collection.title.first)
-      sleep 10
+      # Crude way of waiting for the AJAX response
+      select2_results = []
+      time_elapsed = 0
+      while select2_results.empty? && time_elapsed < 30
+        begin_time = Time.now.to_f
+        doc = Nokogiri::XML.parse(page.body)
+        select2_results = doc.xpath('//html:li[contains(@class,"select2-result")]', html: 'http://www.w3.org/1999/xhtml')
+        end_time = Time.now.to_f
+        time_elapsed += end_time - begin_time
+      end
       expect(page).to have_css('.select2-result')
       within ".select2-result" do
         find("span", text: collection.title.first).click

data/spec/views/catalog/_thumbnail_list_collection.html.erb_spec.rb

@@ -1,10 +1,43 @@
 RSpec.describe 'catalog/_thumbnail_list_collection.html.erb', type: :view do
-  before do
-    stub_template 'catalog/_thumbnail_list_collection.html.erb' => '<div class="col-sm-3"><span class="fa fa-cubes collection-icon-search"></span></div>'
-    render
+  context "When the collection thumbnail is attached" do
+    let(:attributes) do
+      { id: "xxx",
+        "has_model_ssim": ["Collection"],
+        "title_tesim": ["Collection Title"],
+        "description_tesim": ["Collection Description"],
+        "system_modified_dtsi": 'date',
+        "thumbnail_path_ss": '/xxx/yyy?file=thumbnail' }
+    end
+    let(:doc) { SolrDocument.new(attributes) }
+    let(:current_ability) { Ability.new(build(:user)) }
+
+    before do
+      render 'catalog/thumbnail_list_collection', document: doc
+    end
+
+    it 'displays the collection thumbnail in the search results' do
+      expect(rendered).to include '/xxx/yyy?file=thumbnail'
+    end
   end
 
-  it 'displays the collection icon in the search results' do
-    expect(rendered).to match '<div class="col-sm-3"><span class="fa fa-cubes collection-icon-search"></span></div>'
+  context "When the collection thumbnail is not attached" do
+    let(:attributes) do
+      { id: "xxx",
+        "has_model_ssim": ["Collection"],
+        "title_tesim": ["Collection Title"],
+        "description_tesim": ["Collection Description"],
+        "system_modified_dtsi": 'date',
+        "thumbnail_path_ss" => Hyrax::CollectionIndexer.thumbnail_path_service.default_image }
+    end
+    let(:doc) { SolrDocument.new(attributes) }
+    let(:current_ability) { Ability.new(build(:user)) }
+
+    before do
+      render 'catalog/thumbnail_list_collection', document: doc
+    end
+
+    it 'displays the collection icon in the search results' do
+      expect(rendered).to include '/assets/collection-'
+    end
   end
 end

data/template.rb

@@ -1,4 +1,6 @@
-gem 'hyrax', '2.4.1'
+# Hack for https://github.com/rails/rails/issues/35153
+gsub_file 'Gemfile', /^gem ["']sqlite3["']$/, 'gem "sqlite3", "~> 1.3.0"'
+gem 'hyrax', '2.5.0'
 run 'bundle install'
 generate 'hyrax:install', '-f'
 rails_command 'db:migrate'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.5.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2019-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -300,14 +300,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: 10.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: 10.6.1
 - !ruby/object:Gem::Dependency
   name: hydra-works
   requirement: !ruby/object:Gem::Requirement
@@ -730,6 +730,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: chromedriver-helper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -750,14 +764,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -1054,20 +1068,6 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: 3.5.0
-- !ruby/object:Gem::Dependency
-  name: chromedriver-helper
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 description: Hyrax is a featureful Samvera front-end based on the latest and greatest
   Samvera software components.
 email:
@@ -2476,6 +2476,7 @@ files:
 - spec/factories/workflows.rb
 - spec/factory_tests/adminsets_factory_spec.rb
 - spec/factory_tests/collections_factory_spec.rb
+- spec/features/actor_stack_spec.rb
 - spec/features/admin_spec.rb
 - spec/features/batch_create_spec.rb
 - spec/features/batch_edit_spec.rb
@@ -3079,7 +3080,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Hyrax is a front-end based on the robust Samvera framework, providing a user
@@ -3223,6 +3224,7 @@ test_files:
 - spec/factories/workflows.rb
 - spec/factory_tests/adminsets_factory_spec.rb
 - spec/factory_tests/collections_factory_spec.rb
+- spec/features/actor_stack_spec.rb
 - spec/features/admin_spec.rb
 - spec/features/batch_create_spec.rb
 - spec/features/batch_edit_spec.rb