hyrax 2.2.4 → 2.3.0

data/hyrax.gemspec

@@ -82,7 +82,6 @@ SUMMARY
   # temporary pin to 2.17 due to failures caused in 2.18.0
   spec.add_development_dependency "capybara", '~> 2.4', '< 2.18.0'
   spec.add_development_dependency 'capybara-maleficent', '~> 0.2'
-  spec.add_development_dependency "chromedriver-helper"
   spec.add_development_dependency 'database_cleaner', '~> 1.3'
   spec.add_development_dependency 'engine_cart', '~> 2.0'
   spec.add_development_dependency "equivalent-xml", '~> 0.5'
@@ -94,6 +93,7 @@ SUMMARY
   spec.add_development_dependency 'rspec-activemodel-mocks', '~> 1.0'
   spec.add_development_dependency 'rspec-its', '~> 1.1'
   spec.add_development_dependency 'rspec-rails', '~> 3.1'
+  spec.add_development_dependency 'rspec_junit_formatter'
   spec.add_development_dependency "selenium-webdriver"
   spec.add_development_dependency 'solr_wrapper', '>= 1.1', '< 3.0'
   spec.add_development_dependency 'i18n-debug' if ENV['I18N_DEBUG']
@@ -111,4 +111,8 @@ SUMMARY
   # simple_form 3.5.1 broke hydra-editor for certain model types;
   #   see: https://github.com/plataformatec/simple_form/issues/1549
   spec.add_dependency 'simple_form', '~> 3.2', '<= 3.5.0'
+  # chromedriver-helper 2.0 broke the chromedriver used by capybara
+  #   see: https://github.com/flavorjones/chromedriver-helper/issues/62
+  #        and https://github.com/flavorjones/chromedriver-helper/issues/57
+  spec.add_development_dependency 'chromedriver-helper', '< 2.0'
 end

data/lib/hyrax/version.rb

@@ -1,3 +1,3 @@
 module Hyrax
-  VERSION = '2.2.4'.freeze
+  VERSION = '2.3.0'.freeze
 end

data/spec/factories/generic_works.rb

@@ -23,7 +23,6 @@ FactoryBot.define do
     end
 
     title { ["Test title"] }
-    visibility { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }
 
     after(:build) do |work, evaluator|
       work.apply_depositor_metadata(evaluator.user.user_key)
@@ -36,7 +35,8 @@ FactoryBot.define do
     end
 
     factory :private_work do
-      visibility { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }
+      # private is default
+      # visibility { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }
     end
 
     factory :registered_generic_work do

data/spec/features/admin_spec.rb

@@ -12,12 +12,12 @@ RSpec.describe "The admin dashboard", :clean_repo do
   end
 
   before do
-    create(:work_with_two_children, title: ["Work A"], admin_set_id: admin_set_1.id, edit_users: [user])
-    create(:work_with_one_child, title: ["Work B"], admin_set_id: admin_set_2.id, edit_users: [user])
-    create(:work_with_two_children, title: ["Work C"], admin_set_id: admin_set_2.id, edit_users: [user])
+    create(:work_with_files, title: ["Work A"], admin_set_id: admin_set_1.id, edit_users: [user])
+    create(:work_with_one_file, title: ["Work B"], admin_set_id: admin_set_2.id, edit_users: [user])
+    create(:work_with_file_and_work, title: ["Work C"], admin_set_id: admin_set_2.id, edit_users: [user])
   end
 
-  it do
+  it 'renders the counts of Works and Files in all AdminSets' do
     login_as(user, scope: :user)
     visit '/dashboard'
 
@@ -25,6 +25,6 @@ RSpec.describe "The admin dashboard", :clean_repo do
     expect(find('tr', text: 'First Admin Set').find('td:eq(3)')).to have_content(2)
 
     expect(find('tr', text: 'Second Admin Set').find('td:eq(2)')).to have_content(2)
-    expect(find('tr', text: 'Second Admin Set').find('td:eq(3)')).to have_content(3)
+    expect(find('tr', text: 'Second Admin Set').find('td:eq(3)')).to have_content(2)
   end
 end

data/spec/services/hyrax/admin_set_service_spec.rb

@@ -51,71 +51,120 @@ RSpec.describe Hyrax::AdminSetService do
     end
   end
 
-  describe '#search_results_with_work_count' do
+  describe '#search_results_with_work_count', :clean_repo do
     subject { service.search_results_with_work_count(access) }
 
-    let(:access) { :read }
-    let(:documents) { [doc1, doc2, doc3] }
-    let(:doc1) { SolrDocument.new(id: 'xyz123') }
-    let(:doc2) { SolrDocument.new(id: 'yyx123') }
-    let(:doc3) { SolrDocument.new(id: 'zxy123') }
-    let(:connection) { instance_double(RSolr::Client) }
-    let(:facets) { { 'isPartOf_ssim' => [doc1.id, 8, doc2.id, 2] } }
-    let(:document_list) do
+    let(:admin_set_attrs) do
+      [
+        { id: 'admin_set_1' },
+        { id: 'admin_set_2' },
+        { id: 'admin_set_3' }
+      ]
+    end
+
+    let(:file_set_attrs) do
       [
-        {
-          'isPartOf_ssim' => ['xyz123'],
-          'file_set_ids_ssim' => ['aaa']
-        },
-        {
-          'isPartOf_ssim' => ['xyz123', 'yyx123'],
-          'file_set_ids_ssim' => ['bbb', 'ccc']
-        }
+        { id: 'file_1', has_model_ssim: 'FileSet' },
+        { id: 'file_2', has_model_ssim: 'FileSet' },
+        { id: 'file_3', has_model_ssim: 'FileSet' },
+        { id: 'file_4', has_model_ssim: 'FileSet' },
+        { id: 'file_5', has_model_ssim: 'FileSet' },
+        { id: 'file_6', has_model_ssim: 'FileSet' },
+        { id: 'file_7', has_model_ssim: 'FileSet' },
+        { id: 'file_8', has_model_ssim: 'FileSet' },
+        { id: 'file_9', has_model_ssim: 'FileSet' },
+        { id: 'file_10', has_model_ssim: 'FileSet' },
+        { id: 'file_11', has_model_ssim: 'FileSet' }
       ]
     end
 
-    let(:results) do
-      {
-        'response' =>
-          {
-            'docs' => document_list
-          },
-        'facet_counts' =>
-          {
-            'facet_fields' => facets
-          }
-      }
+    let(:work1_attrs) { { id: 'work_1' } }
+    let(:work2_attrs) { { id: 'work_2' } }
+    let(:work3_attrs) { { id: 'work_3' } }
+    let(:work4_attrs) { { id: 'work_4' } }
+    let(:work5_attrs) { { id: 'work_5' } }
+    let(:work6_attrs) { { id: 'work_6' } }
+    let(:work7_attrs) { { id: 'work_7' } }
+    let(:work8_attrs) { { id: 'work_8' } }
+    let(:work9_attrs) { { id: 'work_9' } }
+    let(:work10_attrs) { { id: 'work_10' } }
+    let(:work11_attrs) { { id: 'work_11' } }
+
+    let(:work_attrs) { [work1_attrs, work2_attrs, work3_attrs, work4_attrs, work5_attrs, work6_attrs, work7_attrs, work8_attrs, work9_attrs, work10_attrs, work11_attrs] }
+
+    let(:works) do
+      [].tap do |result|
+        work_attrs.each do |work|
+          result << SolrDocument.new(work)
+        end
+      end
+    end
+
+    let(:admin_sets) do
+      [].tap do |result|
+        admin_set_attrs.each do |admin_set|
+          result << SolrDocument.new(admin_set)
+        end
+      end
     end
 
+    let(:file_sets) do
+      [].tap do |result|
+        file_set_attrs.each do |file_set|
+          result << SolrDocument.new(file_set)
+        end
+      end
+    end
+
+    let(:access) { :read }
     let(:struct) { described_class::SearchResultForWorkCount }
 
     before do
-      allow(service).to receive(:search_results).and_return(documents)
-      allow(ActiveFedora::SolrService.instance).to receive(:conn).and_return(connection)
-      allow(connection).to receive(:get).with("select", params: { fq: "{!terms f=isPartOf_ssim}xyz123,yyx123,zxy123",
-                                                                  "facet.field" => "isPartOf_ssim" }).and_return(results)
+      allow(service).to receive(:search_results).and_return(admin_sets)
+      all_objects = []
+      all_objects << works << admin_sets << file_sets
+      all_objects.each do |obj|
+        ActiveFedora::SolrService.add(obj)
+      end
+      ActiveFedora::SolrService.commit
     end
 
-    context "when there are works in the admin set" do
-      it "returns rows with document in the first column and integer count value in the second and third column" do
-        expect(subject).to eq [struct.new(doc1, 8, 3), struct.new(doc2, 2, 2), struct.new(doc3, 0, 0)]
+    context "when there are works and files in the admin set" do
+      let(:work1_attrs) { { id: 'work_1', isPartOf_ssim: 'admin_set_1', file_set_ids_ssim: ['file_1', 'file_3', 'file_4'] } }
+      let(:work2_attrs) { { id: 'work_2', isPartOf_ssim: 'admin_set_2', file_set_ids_ssim: ['file_2'] } }
+      let(:work3_attrs) { { id: 'work_3', isPartOf_ssim: 'admin_set_2', file_set_ids_ssim: ['file_6', 'file_7'] } }
+      let(:work4_attrs) { { id: 'work_4', isPartOf_ssim: 'admin_set_3', file_set_ids_ssim: ['file_8'] } }
+
+      it "returns rows with document in the first column, count of works in second column and count of files in the third column" do
+        expect(subject).to eq [struct.new(admin_sets[0], 1, 3), struct.new(admin_sets[1], 2, 3), struct.new(admin_sets[2], 1, 1)]
       end
     end
 
     context "when there are no files in the admin set" do
-      let(:document_list) do
-        [
-          {
-            'isPartOf_ssim' => ['xyz123']
-          },
-          {
-            'isPartOf_ssim' => ['xyz123', 'yyx123']
-          }
-        ]
+      let(:work1_attrs) { { id: 'work_1', isPartOf_ssim: 'admin_set_1', file_set_ids_ssim: [] } }
+      let(:work2_attrs) { { id: 'work_2', isPartOf_ssim: 'admin_set_2', file_set_ids_ssim: [] } }
+      let(:work3_attrs) { { id: 'work_3', isPartOf_ssim: 'admin_set_2', file_set_ids_ssim: [] } }
+
+      it "returns rows with document in the first column, count of works in second column and count of no files in the third column" do
+        expect(subject).to eq [struct.new(admin_sets[0], 1, 0), struct.new(admin_sets[1], 2, 0), struct.new(admin_sets[2], 0, 0)]
       end
+    end
 
-      it "returns rows with document in the first column and integer count value in the second and third column" do
-        expect(subject).to eq [struct.new(doc1, 8, 0), struct.new(doc2, 2, 0), struct.new(doc3, 0, 0)]
+    context "when there are more than 10 works in the admin set" do
+      let(:work1_attrs) { { id: 'work_1', isPartOf_ssim: 'admin_set_1', file_set_ids_ssim: ['file_1'] } }
+      let(:work2_attrs) { { id: 'work_2', isPartOf_ssim: 'admin_set_1', file_set_ids_ssim: ['file_2'] } }
+      let(:work3_attrs) { { id: 'work_3', isPartOf_ssim: 'admin_set_1', file_set_ids_ssim: ['file_3'] } }
+      let(:work4_attrs) { { id: 'work_4', isPartOf_ssim: 'admin_set_1', file_set_ids_ssim: ['file_4'] } }
+      let(:work5_attrs) { { id: 'work_5', isPartOf_ssim: 'admin_set_1', file_set_ids_ssim: ['file_5'] } }
+      let(:work6_attrs) { { id: 'work_6', isPartOf_ssim: 'admin_set_1', file_set_ids_ssim: ['file_6'] } }
+      let(:work7_attrs) { { id: 'work_7', isPartOf_ssim: 'admin_set_1', file_set_ids_ssim: ['file_7'] } }
+      let(:work8_attrs) { { id: 'work_8', isPartOf_ssim: 'admin_set_1', file_set_ids_ssim: ['file_8'] } }
+      let(:work9_attrs) { { id: 'work_9', isPartOf_ssim: 'admin_set_1', file_set_ids_ssim: ['file_9'] } }
+      let(:work10_attrs) { { id: 'work_10', isPartOf_ssim: 'admin_set_1', file_set_ids_ssim: ['file_10'] } }
+      let(:work11_attrs) { { id: 'work_11', isPartOf_ssim: 'admin_set_1', file_set_ids_ssim: ['file_11'] } }
+
+      it "returns rows with document in the first column, count of works in second column and count of files in the third column" do
+        expect(subject).to eq [struct.new(admin_sets[0], 11, 11), struct.new(admin_sets[1], 0, 0), struct.new(admin_sets[2], 0, 0)]
       end
     end
   end

data/template.rb

@@ -1,4 +1,4 @@
-gem 'hyrax', '2.2.4'
+gem 'hyrax', '2.3.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.2.4
+  version: 2.3.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-11 00:00:00.000000000 Z
+date: 2018-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -716,20 +716,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: chromedriver-helper
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -902,6 +888,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -1040,6 +1040,20 @@ 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:
@@ -1054,6 +1068,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".codeclimate.yml"
 - ".engine_cart.yml"
 - ".eslintignore"
@@ -1874,7 +1889,10 @@ files:
 - app/views/hyrax/dashboard/_index_partials/_current_proxy_rights.html.erb
 - app/views/hyrax/dashboard/_index_partials/_proxy_rights.html.erb
 - app/views/hyrax/dashboard/_index_partials/_transfers.html.erb
+- app/views/hyrax/dashboard/_repository_growth.html.erb
+- app/views/hyrax/dashboard/_repository_objects.html.erb
 - app/views/hyrax/dashboard/_sidebar.html.erb
+- app/views/hyrax/dashboard/_user_activity.html.erb
 - app/views/hyrax/dashboard/collections/_batch_edits_actions.html.erb
 - app/views/hyrax/dashboard/collections/_bookmark_control.html.erb
 - app/views/hyrax/dashboard/collections/_button_create_collection.html.erb