curation_concerns 1.3.3 → 1.4.0

data/spec/features/update_file_spec.rb

@@ -5,6 +5,13 @@ feature 'Editing attached files' do
   let!(:parent) { create(:work_with_one_file, user: user) }
   let!(:file_set) { parent.file_sets.first }
 
+  around do |example|
+    original_adapter = ActiveJob::Base.queue_adapter
+    ActiveJob::Base.queue_adapter = :inline
+    example.run
+    ActiveJob::Base.queue_adapter = original_adapter
+  end
+
   before do
     sign_in user
 

data/spec/features/work_generator_spec.rb

@@ -24,7 +24,7 @@ feature 'Creating a new Work' do
     sign_in user
 
     # stub out characterization. Travis doesn't have fits installed, and it's not relevant to the test.
-    expect(CharacterizeJob).to receive(:perform_later)
+    allow(CharacterizeJob).to receive(:perform_later)
     redlock_client_stub
   end
 

data/spec/models/collection_spec.rb

@@ -65,7 +65,7 @@ describe Collection, type: :model do
         subject { described_class.create!(title: ['Some title'], members: [gf1, gf2]) { |c| c.apply_depositor_metadata(user) } }
 
         it "has many files" do
-          expect(subject.reload.members).to eq [gf1, gf2]
+          expect(subject.reload.members).to match_array [gf1, gf2]
         end
       end
 
@@ -78,14 +78,14 @@ describe Collection, type: :model do
           subject.reload
           subject.members << gf2
           subject.save
-          expect(subject.reload.members).to eq [gf1, gf2]
+          expect(subject.reload.members).to match_array [gf1, gf2]
         end
 
         it "allows multiple files to be added" do
           subject.reload
           subject.add_members [gf2.id, gf3.id]
           subject.save
-          expect(subject.reload.members).to eq [gf1, gf2, gf3]
+          expect(subject.reload.members).to match_array [gf1, gf2, gf3]
         end
       end
     end

data/spec/models/curation_concerns/work_behavior_spec.rb

@@ -19,7 +19,8 @@ describe CurationConcerns::WorkBehavior do
   end
   describe '#to_s' do
     it 'uses the provided titles' do
-      subject.title = %w(Hello World)
+      # The title property would return the terms in random order, so stub the behavior:
+      allow(subject).to receive(:title).and_return(%w(Hello World))
       expect(subject.to_s).to eq('Hello | World')
     end
   end

data/spec/models/file_set_spec.rb

@@ -442,7 +442,8 @@ describe FileSet do
 
   describe '#to_s' do
     it 'uses the provided titles' do
-      subject.title = %w(Hello World)
+      # The title property would return the terms in random order, so stub the behavior:
+      allow(subject).to receive(:title).and_return(%w(Hello World))
       expect(subject.to_s).to eq('Hello | World')
     end
 

data/spec/presenters/curation_concerns/work_show_presenter_spec.rb

@@ -77,7 +77,6 @@ describe CurationConcerns::WorkShowPresenter do
     let(:attributes) { obj.to_solr }
 
     it "displays them in order" do
-      expect(obj.ordered_member_ids).not_to eq obj.member_ids
       expect(presenter.file_set_presenters.map(&:id)).to eq obj.ordered_member_ids
     end
 

data/spec/services/file_set_audit_service_spec.rb

@@ -42,6 +42,13 @@ describe CurationConcerns::FileSetAuditService do
     end
 
     context 'when no audit is pasing' do
+      around do |example|
+        original_adapter = ActiveJob::Base.queue_adapter
+        ActiveJob::Base.queue_adapter = :inline
+        example.run
+        ActiveJob::Base.queue_adapter = original_adapter
+      end
+
       before do
         CurationConcerns::VersioningService.create(f.original_file)
         ChecksumAuditLog.create!(pass: 1, file_set_id: f.id, version: f.original_file.versions.first.uri, file_id: 'original_file')
@@ -54,6 +61,13 @@ describe CurationConcerns::FileSetAuditService do
   end
 
   describe '#human_readable_audit_status' do
+    around do |example|
+      original_adapter = ActiveJob::Base.queue_adapter
+      ActiveJob::Base.queue_adapter = :inline
+      example.run
+      ActiveJob::Base.queue_adapter = original_adapter
+    end
+
     before do
       CurationConcerns::VersioningService.create(f.original_file)
       ChecksumAuditLog.create!(pass: 1, file_set_id: f.id, version: f.original_file.versions.first.uri, file_id: 'original_file')

data/spec/services/graph_exporter_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe CurationConcerns::GraphExporter do
     subject { service.fetch }
     let(:ttl) { subject.dump(:ttl) }
     it "transforms suburis to hashcodes" do
-      expect(ttl).to match %r{<http://localhost/concern/generic_works/#{work.id}> a <http://projecthydra\.org/works/models#Work>,}
+      expect(ttl).to match %r{<http://localhost/concern/generic_works/#{work.id}> a ([^;]*)<http://projecthydra\.org/works/models#Work>}
       expect(ttl).to match %r{<http://purl\.org/dc/terms/title> "Test title";}
       expect(ttl).to match %r{<http://www\.w3\.org/ns/auth/acl#accessControl> <http://localhost/catalog/}
 

data/spec/spec_helper.rb

@@ -81,9 +81,22 @@ RSpec.configure do |config|
     config.include Devise::TestHelpers, type: :controller
     config.include Devise::TestHelpers, type: :view
   end
+
+  config.include TestViewHelpers, type: :view
+
   config.include Warden::Test::Helpers, type: :feature
   config.after(:each, type: :feature) { Warden.test_reset! }
+
+  config.include(ControllerLevelHelpers, type: :helper)
+  config.before(:each, type: :helper) { initialize_controller_helpers(helper) }
+
+  config.include(ControllerLevelHelpers, type: :view)
+  config.before(:each, type: :view) { initialize_controller_helpers(view) }
+
   config.include Controllers::EngineHelpers, type: :controller
+  config.include Controllers::EngineHelpers, type: :helper
+  config.include ::Rails.application.routes.url_helpers
+
   config.include Rails.application.routes.url_helpers, type: :routing
   config.include Capybara::DSL
   config.include InputSupport, type: :input

data/spec/support/helpers/controller_level_helpers.rb

@@ -0,0 +1,27 @@
+module ControllerLevelHelpers
+  extend ActiveSupport::Concern
+  # def search_state
+  #   @search_state ||= Blacklight::SearchState.new(params, blacklight_config)
+  # end
+
+  # def blacklight_configuration_context
+  #   @blacklight_configuration_context ||= Blacklight::Configuration::Context.new(controller)
+  # end
+  #
+  included do
+    # fix for anonymous controllers (https://github.com/rspec/rspec-rails/issues/1321#issuecomment-239157093)
+    before { allow(controller).to receive(:_routes).and_return(Rails.application.routes) }
+  end
+
+  def initialize_controller_helpers(helper)
+    helper.extend ControllerLevelHelpers
+    initialize_routing_helpers(helper)
+  end
+
+  def initialize_routing_helpers(helper)
+    return unless Rails::VERSION::MAJOR >= 5
+
+    helper.class.include ::Rails.application.routes.url_helpers
+    helper.class.include ::Rails.application.routes.mounted_helpers if ::Rails.application.routes.respond_to?(:mounted_helpers)
+  end
+end

data/spec/support/views/test_view_helpers.rb

@@ -0,0 +1,10 @@
+module TestViewHelpers
+  extend ActiveSupport::Concern
+
+  included do
+    before do
+      view.send(:extend, CurationConcerns::MainAppHelpers)
+      view.send(:extend, CatalogHelper)
+    end
+  end
+end

data/spec/test_app_templates/Gemfile.extra

@@ -1,5 +1,7 @@
 # placeholder to use for pinning against specific gem commit references
 
+gem 'breadcrumbs_on_rails', git: 'https://github.com/weppos/breadcrumbs_on_rails.git'
+
 group :development do
   gem 'better_errors'
   gem 'binding_of_caller'

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

@@ -34,9 +34,6 @@ describe 'catalog/index.html.erb' do
     allow(resp).to receive(:limit_value).and_return(10)
     allow(resp).to receive(:empty?).and_return(false)
 
-    # This stubs out the SolrDocument#to_model
-    allow(ActiveFedora::Base).to receive(:load_instance_from_solr).with('abc123', doc).and_return(collection)
-
     assign(:document_list, [doc])
   end
 

data/spec/views/curation_concerns/base/_form_rights_spec.rb

@@ -23,14 +23,16 @@ describe 'curation_concerns/base/_form_rights.html.erb' do
       render inline: form_template, locals: { curation_concern: curation_concern }
     end
 
-    it 'will only include active values if the current value is active' do
-      expect(rendered).not_to have_xpath('//div/ul/li[1]/select/option[@value="demo_id_04"]')
-      expect(rendered).not_to have_xpath('//div/ul/li[1]/select/option[text()="Fourth is an Inactive Term"]')
-    end
+    it 'will only include inactive values if the current value is inactive' do
+      # only one of the select boxes will have the inactive rights statement
+      expect(rendered).to have_xpath('//option[@value="demo_id_04"]', count: 1)
+      # and it will be the selected option.
+      expect(rendered).to have_xpath('//option[@value="demo_id_04" and @selected]', count: 1)
 
-    it 'will always include the current value as an option' do
-      expect(rendered).to have_xpath('//div/ul/li[2]/select/option[@value="demo_id_04" and @selected="selected"]')
-      expect(rendered).to have_xpath('//div/ul/li[2]/select/option[text()="Fourth is an Inactive Term"]')
+      # the active values will be available in each select box
+      expect(rendered).to have_xpath('//option[@value="demo_id_01"]', count: 3)
+      # and one will be selected
+      expect(rendered).to have_xpath('//option[@value="demo_id_01" and @selected]', count: 1)
     end
 
     it 'only offers active values to add to a work' do

data/spec/views/curation_concerns/file_sets/show.json.jbuilder_spec.rb

@@ -2,9 +2,11 @@ require 'spec_helper'
 
 describe 'curation_concerns/file_sets/show.json.jbuilder' do
   let(:file_set) { create(:file_set) }
+  let(:solr_doc) { SolrDocument.new(file_set.to_solr) }
+  let(:presenter) { CurationConcerns::FileSetPresenter.new(solr_doc, nil) }
 
   before do
-    assign(:file_set, file_set)
+    assign(:presenter, presenter)
     render
   end
 
@@ -12,10 +14,8 @@ describe 'curation_concerns/file_sets/show.json.jbuilder' do
     json = JSON.parse(rendered)
     expect(json['id']).to eq file_set.id
     expect(json['title']).to eq file_set.title
-    expected_fields = file_set.class.fields.select { |f| ![:has_model, :create_date].include? f }
-    expected_fields << :date_created
-    expected_fields.each do |field_symbol|
-      expect(json).to have_key(field_symbol.to_s)
-    end
+    expect(json).to have_key('label')
+    expect(json).to have_key('description')
+    expect(json).to have_key('creator')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -38,20 +38,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 11.a
+        version: 11.0.0.rc6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 11.a
+        version: 11.0.0.rc6
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -496,6 +490,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: equivalent-xml
+  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: rspec-activemodel-mocks
   requirement: !ruby/object:Gem::Requirement
@@ -681,12 +689,13 @@ files:
 - app/assets/javascripts/curation_concerns/.gitkeep
 - app/assets/javascripts/curation_concerns/application.js
 - app/assets/javascripts/curation_concerns/batch_select.js
+- app/assets/javascripts/curation_concerns/boot.es6
 - app/assets/javascripts/curation_concerns/browse_everything_implement.js
 - app/assets/javascripts/curation_concerns/collections.js
 - app/assets/javascripts/curation_concerns/curation_concerns.js
 - app/assets/javascripts/curation_concerns/embargoes.js
 - app/assets/javascripts/curation_concerns/facet_mine.js
-- app/assets/javascripts/curation_concerns/file_manager/affix.es6
+- app/assets/javascripts/curation_concerns/file_manager.es6
 - app/assets/javascripts/curation_concerns/file_manager/member.es6
 - app/assets/javascripts/curation_concerns/file_manager/save_manager.es6
 - app/assets/javascripts/curation_concerns/file_manager/sorting.es6
@@ -1240,12 +1249,14 @@ files:
 - spec/support/features.rb
 - spec/support/features/fixture_file_upload.rb
 - spec/support/features/session_helpers.rb
+- spec/support/helpers/controller_level_helpers.rb
 - spec/support/input_support.rb
 - spec/support/matchers/api_responses.rb
 - spec/support/rake_support.rb
 - spec/support/shared/shared_examples_has_dc_metadata.rb
 - spec/support/shared/shared_examples_is_embargoable.rb
 - spec/support/shared/shared_examples_with_access_rights.rb
+- spec/support/views/test_view_helpers.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/views/catalog/_action_menu_partials/_default.html.erb_spec.rb
@@ -1450,12 +1461,14 @@ test_files:
 - spec/support/features.rb
 - spec/support/features/fixture_file_upload.rb
 - spec/support/features/session_helpers.rb
+- spec/support/helpers/controller_level_helpers.rb
 - spec/support/input_support.rb
 - spec/support/matchers/api_responses.rb
 - spec/support/rake_support.rb
 - spec/support/shared/shared_examples_has_dc_metadata.rb
 - spec/support/shared/shared_examples_is_embargoable.rb
 - spec/support/shared/shared_examples_with_access_rights.rb
+- spec/support/views/test_view_helpers.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/views/catalog/_action_menu_partials/_default.html.erb_spec.rb

data/app/assets/javascripts/curation_concerns/file_manager/affix.es6

@@ -1,13 +0,0 @@
-Blacklight.onLoad(function() {
-  let tools = $("#file-manager-tools")
-  if(tools.length > 0) {
-    tools.affix({
-      offset: {
-        top: $("#file-manager-tools .actions").offset().top,
-        bottom: function() {
-          return $("#file-manager-extra-tools").outerHeight(true) + $("footer").outerHeight(true)
-        }
-      }
-    })
-  }
-})