hyrax 3.0.0.pre.beta2 → 3.0.0.pre.beta3

data/spec/services/hyrax/thumbnail_path_service_spec.rb

@@ -46,6 +46,12 @@ RSpec.describe Hyrax::ThumbnailPathService do
       it { is_expected.to eq '/downloads/999?file=thumbnail' }
     end
 
+    context 'when it has a missing thumbnail' do
+      let(:object) { GenericWork.new(thumbnail_id: 'very_fake') }
+
+      it { is_expected.to be_nil }
+    end
+
     context "that doesn't have a representative" do
       let(:object) { FileSet.new }
 

data/spec/services/hyrax/versioning_service_spec.rb

@@ -1,26 +1,46 @@
 RSpec.describe Hyrax::VersioningService do
-  describe '#latest_version_of' do
-    let(:user) { build(:user) }
-    let(:file) { create(:file_set) }
+  let(:user) { build(:user) }
+  let(:file) { create(:file_set) }
+
+  before do
+    # Add the original_file (this service  creates a version after saving when you call it with versioning: true)
+    Hydra::Works::AddFileToFileSet.call(file, File.open(fixture_path + '/world.png'), :original_file, versioning: true)
+  end
 
-    before do
-      # Add the original_file (this service  creates a version after saving when you call it with versioning: true)
-      Hydra::Works::AddFileToFileSet.call(file, File.open(fixture_path + '/world.png'), :original_file, versioning: true)
+  describe '#versioned_file_id' do
+    subject { described_class.versioned_file_id file.original_file }
+
+    context 'without version data' do
+      before do
+        allow(file.original_file).to receive(:has_versions?).and_return(false)
+      end
+      it { is_expected.to eq file.original_file.id }
     end
 
-    describe 'latest_version_of' do
-      subject { described_class.latest_version_of(file.original_file).label }
+    context 'with one version' do
+      it { is_expected.to eq "#{file.original_file.id}/fcr:versions/version1" }
+    end
 
-      context 'with one version' do
-        it { is_expected.to eq 'version1' }
+    context 'with two versions' do
+      before do
+        file.original_file.create_version
       end
+      it { is_expected.to eq "#{file.original_file.id}/fcr:versions/version2" }
+    end
+  end
+
+  describe '#latest_version_of' do
+    subject { described_class.latest_version_of(file.original_file).label }
+
+    context 'with one version' do
+      it { is_expected.to eq 'version1' }
+    end
 
-      context 'with two versions' do
-        before do
-          file.original_file.create_version
-        end
-        it { is_expected.to eq 'version2' }
+    context 'with two versions' do
+      before do
+        file.original_file.create_version
       end
+      it { is_expected.to eq 'version2' }
     end
   end
 end

data/spec/services/hyrax/visibility_intention_applicator_spec.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+RSpec.describe Hyrax::VisibilityIntentionApplicator do
+  subject(:applicator) { described_class.new(intention: intention) }
+  let(:work)           { build(:work) }
+
+  let(:intention) do
+    instance_double(Hyrax::VisibilityIntention,
+                    'wants_embargo?': false,
+                    'wants_lease?':   false,
+                    visibility:       Hyrax::VisibilityIntention::PUBLIC)
+  end
+
+  describe '#apply' do
+    it 'initializes with intention' do
+      expect(described_class.apply(intention))
+        .to have_attributes(intention: intention)
+    end
+  end
+
+  describe '#apply_to' do
+    it 'applies simple visibility' do
+      expect { applicator.apply_to(model: work) }
+        .to change { work.visibility }
+        .to Hyrax::VisibilityIntention::PUBLIC
+    end
+
+    context 'when applying an embargo' do
+      let(:after)    { Hyrax::VisibilityIntention::PUBLIC }
+      let(:params)   { [end_date, during, after] }
+      let(:end_date) { (Time.zone.now + 2).to_s }
+      let(:during)   { Hyrax::VisibilityIntention::PRIVATE }
+
+      let(:intention) do
+        instance_double(Hyrax::VisibilityIntention,
+                        'wants_embargo?': true,
+                        'wants_lease?':   false,
+                        'valid_embargo?': true,
+                        embargo_params:   params)
+      end
+
+      it 'applies an embargo' do
+        expect { applicator.apply_to(model: work) }
+          .to change { work.embargo }
+          .to be_an_embargo_matching(release_date: end_date, during: during, after: after)
+      end
+    end
+
+    context 'when applying a lease' do
+      let(:after)    { Hyrax::VisibilityIntention::PUBLIC }
+      let(:during)   { Hyrax::VisibilityIntention::PRIVATE }
+      let(:params)   { [end_date, during, after] }
+      let(:end_date) { (Time.zone.now + 2).to_s }
+
+      let(:intention) do
+        instance_double(Hyrax::VisibilityIntention,
+                        'wants_embargo?': false,
+                        'wants_lease?':   true,
+                        'valid_lease?':   true,
+                        lease_params:     params)
+      end
+
+      it 'applies an lease' do
+        expect { applicator.apply_to(model: work) }
+          .to change { work.lease }
+          .to be_a_lease_matching(release_date: end_date, during: during, after: after)
+      end
+    end
+  end
+end

data/spec/services/hyrax/visibility_reader_spec.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+RSpec.describe Hyrax::VisibilityReader do
+  subject(:reader) { described_class.new(resource: resource) }
+  let(:resource)   { Hyrax::Resource.new }
+
+  let(:open) { Hydra::AccessControls::AccessRight::PERMISSION_TEXT_VALUE_PUBLIC }
+  let(:auth) { Hydra::AccessControls::AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED }
+
+  describe '#read' do
+    context 'when public group can read' do
+      before { resource.read_groups = [open] }
+
+      it 'is open' do
+        expect(reader.read).to eq 'open'
+      end
+    end
+
+    context 'when authenticated group can read' do
+      before { resource.read_groups = [auth] }
+
+      it 'is authenticated' do
+        expect(reader.read).to eq 'authenticated'
+      end
+
+      it 'and public can also read is open' do
+        resource.read_groups += [open]
+        expect(reader.read).to eq 'open'
+      end
+    end
+
+    context 'when neither group can read' do
+      it 'is restricted' do
+        expect(reader.read).to eq 'restricted'
+      end
+    end
+  end
+end

data/spec/services/hyrax/visibility_writer_spec.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+RSpec.describe Hyrax::VisibilityWriter do
+  subject(:writer) { described_class.new(resource: resource) }
+  let(:resource)   { Hyrax::Resource.new }
+  let(:open)       { writer.visibility_map.visibilities.first }
+  let(:auth)       { writer.visibility_map.visibilities[1] }
+  let(:restricted) { writer.visibility_map.visibilities[2] }
+
+  describe '#assign_access_for' do
+    context 'when setting to public' do
+      it 'adds public read group' do
+        expect { writer.assign_access_for(visibility: open) }
+          .to change { resource.read_groups }
+          .to contain_exactly(writer.visibility_map[open][:permission])
+      end
+    end
+
+    context 'when setting to authenticated' do
+      it 'adds authenticated read group and removes public' do
+        writer.assign_access_for(visibility: open)
+
+        expect { writer.assign_access_for(visibility: auth) }
+          .to change { resource.read_groups }
+          .to contain_exactly(writer.visibility_map[auth][:permission])
+      end
+    end
+
+    context 'when setting to private' do
+      it 'removes public' do
+        writer.assign_access_for(visibility: open)
+
+        expect { writer.assign_access_for(visibility: restricted) }
+          .to change { resource.read_groups }
+          .to be_empty
+      end
+
+      it 'removes authenticated' do
+        writer.assign_access_for(visibility: auth)
+
+        expect { writer.assign_access_for(visibility: restricted) }
+          .to change { resource.read_groups }
+          .to be_empty
+      end
+    end
+  end
+end

data/spec/services/hyrax/workflow/status_list_service_spec.rb

@@ -21,7 +21,7 @@ RSpec.describe Hyrax::Workflow::StatusListService do
     let(:results) { service.each.to_a }
 
     before do
-      ActiveFedora::SolrService.add([document, ability], commit: true)
+      Hyrax::SolrService.add([document, ability], commit: true)
     end
 
     context "when user has roles" do
@@ -41,18 +41,6 @@ RSpec.describe Hyrax::Workflow::StatusListService do
         expect(results.first.to_s).to eq 'Hey dood!'
         expect(results.first.workflow_state).to eq 'initial'
       end
-
-      describe '#search_solr' do
-        let(:mock_response) { { 'response' => { 'docs' => [{}, {}, {}] } } }
-
-        it 'queries Solr via HTTP POST method' do
-          allow(ActiveFedora::SolrService).to receive(:post).and_return(mock_response)
-          allow(ActiveFedora::SolrService).to receive(:get)
-          service.send(:search_solr)
-          expect(ActiveFedora::SolrService).to have_received(:post)
-          expect(ActiveFedora::SolrService).not_to have_received(:get)
-        end
-      end
     end
 
     context "when user doesn't have roles" do

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

@@ -0,0 +1,29 @@
+# rubocop:disable RSpec/InstanceVariable
+RSpec.describe Hyrax::Works::MigrationService, clean_repo: true do
+  let(:predicate_from) { ::RDF::Vocab::DC11.description }
+  let(:predicate_to) { ::RDF::Vocab::SCHEMA.description }
+  let(:predicate_from2) { ::RDF::Vocab::DC.rights }
+  let(:predicate_to2) { ::RDF::URI.new('http://dublincore.org/documents/dcmi-terms/#terms-license') }
+
+  describe "#migrate_predicate" do
+    it "uses DC description and terms-license license by default" do
+      @work = GenericWork.create(title: ["War and Peace"], description: ["war", "peace"],
+                                 license: ["the_license_string"])
+      expect(@work.ldp_source.content).to include("http://purl.org/dc/elements/1.1/description")
+      expect(@work.ldp_source.content).to include(predicate_to2.to_s)
+    end
+
+    it "updates to use SCHEMA description" do
+      @work = GenericWork.create(title: ["War and Peace"], description: ["war", "peace"],
+                                 license: ["the_license_string"])
+      described_class.migrate_predicate(predicate_from, predicate_to)
+      described_class.migrate_predicate(predicate_from2, predicate_to2)
+      @work.reload
+      expect(@work.ldp_source.content).to include("http://schema.org/description")
+      expect(@work.ldp_source.content).not_to include("http://purl.org/dc/elements/1.1/description")
+      expect(@work.ldp_source.content).to include(predicate_to2.to_s)
+      expect(@work.ldp_source.content).not_to include(predicate_from2.to_s)
+    end
+  end
+end
+# rubocop:enable RSpec/InstanceVariable

data/spec/spec_helper.rb

@@ -1,28 +1,25 @@
 ENV["RAILS_ENV"] ||= 'test'
 require "bundler/setup"
 
-def coverage_needed?
-  ENV['COVERAGE'] || ENV['TRAVIS']
-end
-
 def ci_build?
-  ENV['TRAVIS'] || ENV['CIRCLE']
+  ENV['CI']
 end
 
-if coverage_needed?
-  require 'simplecov'
-  require 'coveralls'
-  SimpleCov.root(File.expand_path('../..', __FILE__))
-  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-  SimpleCov.start('rails') do
-    add_filter '/.internal_test_app'
-    add_filter '/lib/generators'
-    add_filter '/spec'
-    add_filter '/tasks'
-    add_filter '/lib/hyrax/version.rb'
-    add_filter '/lib/hyrax/engine.rb'
-  end
-  SimpleCov.command_name 'spec'
+require 'simplecov'
+require 'coveralls'
+Coveralls.wear!
+SimpleCov.root(File.expand_path('../..', __FILE__))
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  Coveralls::SimpleCov::Formatter,
+  SimpleCov::Formatter::HTMLFormatter
+]
+SimpleCov.start('rails') do
+  add_filter '/.internal_test_app'
+  add_filter '/lib/generators'
+  add_filter '/spec'
+  add_filter '/tasks'
+  add_filter '/lib/hyrax/version.rb'
+  add_filter '/lib/hyrax/engine.rb'
 end
 
 require 'factory_bot'
@@ -40,7 +37,7 @@ require 'rspec/active_model/mocks'
 require 'capybara/rspec'
 require 'capybara/rails'
 require 'selenium-webdriver'
-require 'chromedriver-helper'
+require 'webdrivers'
 require 'equivalent-xml'
 require 'equivalent-xml/rspec_matchers'
 require 'database_cleaner'
@@ -62,7 +59,7 @@ end
 Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each { |f| require f }
 
 require 'webmock/rspec'
-WebMock.disable_net_connect!(allow_localhost: true)
+WebMock.disable_net_connect!(allow_localhost: true, allow: 'chromedriver.storage.googleapis.com')
 
 require 'i18n/debug' if ENV['I18N_DEBUG']
 require 'byebug' unless ci_build?
@@ -83,6 +80,9 @@ end
 Capybara.default_driver = :rack_test # This is a faster driver
 Capybara.javascript_driver = :selenium_chrome_headless_sandboxless # This is slower
 
+# FIXME: Pin to older version of chromedriver to avoid issue with clicking non-visible elements
+Webdrivers::Chromedriver.version = '72.0.3626.69'
+
 ActiveJob::Base.queue_adapter = :test
 
 # require 'http_logger'
@@ -146,6 +146,7 @@ RSpec.configure do |config|
   config.include Shoulda::Matchers::ActiveRecord, type: :model
   config.include Shoulda::Matchers::ActiveModel, type: :form
   config.include Shoulda::Callback::Matchers::ActiveModel
+  config.include Hyrax::Matchers
   config.full_backtrace = true if ci_build?
   config.expect_with :rspec do |c|
     c.syntax = :expect
@@ -192,11 +193,11 @@ RSpec.configure do |config|
 
   config.before(:each, type: :view) do
     initialize_controller_helpers(view)
-    WebMock.disable_net_connect!(allow_localhost: false)
+    WebMock.disable_net_connect!(allow_localhost: false, allow: 'chromedriver.storage.googleapis.com')
   end
 
   config.after(:each, type: :view) do
-    WebMock.disable_net_connect!(allow_localhost: true)
+    WebMock.disable_net_connect!(allow_localhost: true, allow: 'chromedriver.storage.googleapis.com')
   end
 
   config.before(:all, type: :feature) do

data/spec/support/clean_solr.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+RSpec.configure do |config|
+  config.before(:each, clean_index: true) do
+    client = Valkyrie::IndexingAdapter.find(:solr_index).connection
+    client.delete_by_query("*:*", params: { softCommit: true })
+  end
+end

data/spec/support/create_for_repository.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+# Factories in Factory Bot don't return the value returned via `to_create`.
+# This custom strategy is necessary to enable data mapper patterns in Factory
+# Bot. Without it, when you create the resource you get back doesn't have an id.
+#
+# Copied from:
+#   https://github.com/thoughtbot/factory_bot/issues/565
+class CreateStategyForRepositoryPattern
+  def association(runner)
+    runner.run
+  end
+
+  def result(evaluation)
+    result = nil
+    evaluation.object.tap do |instance|
+      evaluation.notify(:after_build, instance)
+      evaluation.notify(:before_create, instance)
+      result = evaluation.create(instance)
+      evaluation.notify(:after_create, result)
+    end
+
+    result
+  end
+end
+FactoryBot.register_strategy(:create_for_repository, CreateStategyForRepositoryPattern)

data/spec/support/factory_helpers.rb

@@ -16,9 +16,11 @@ module Hyrax
                  file_title:        opts.fetch(:file_title, []),
                  last_modified:     opts.fetch(:last_modified, []),
                  original_checksum: opts.fetch(:original_checksum, []),
+                 alpha_channels:    opts.fetch(:alpha_channels, []),
                  digest:            opts.fetch(:digest, []),
                  duration:          opts.fetch(:duration, []),
-                 sample_rate:       opts.fetch(:sample_rate, []))
+                 sample_rate:       opts.fetch(:sample_rate, []),
+                 versions:          opts.fetch(:versions, []))
     end
   end
 end

data/spec/support/fakes/fake_actor.rb

@@ -0,0 +1,21 @@
+class FakeActor < Hyrax::Actors::AbstractActor
+  attr_accessor :created, :destroyed, :updated
+
+  def create(env)
+    self.created = env
+
+    true
+  end
+
+  def destroy(env)
+    self.destroyed = env
+
+    true
+  end
+
+  def update(env)
+    self.updated = env
+
+    true
+  end
+end