curate 0.6.1 → 0.6.3

data/spec/internal/spec/factories/spams_factory.rb

@@ -17,7 +17,6 @@ FactoryGirl.define do
 
     before(:create) { |work, evaluator|
       work.apply_depositor_metadata(evaluator.user.user_key)
-      work.contributors << FactoryGirl.create(:person)
     }
 
     factory :private_spam do

data/spec/internal/spec/fixtures/cassettes/remotely_identified_doi_mint_generic_work.yml

@@ -5,12 +5,9 @@ http_interactions:
     uri: https://apitest:apitest@n2t.net/ezid/shoulder/doi:10.5072/FK2
     body:
       encoding: UTF-8
-      string: |-
-        _target: http://localhost/show/h415p846d94
-        datacite.creator: info:fedora/sufia:h415p846d8s
-        datacite.title: Title 183
-        datacite.publisher: An Interesting Chap!
-        datacite.publicationyear: 2013
+      string: "_target: http://localhost/show/h415p852938\ndatacite.creator: \ndatacite.title:
+        Title 4\ndatacite.publisher: An Interesting Chap!\ndatacite.publicationyear:
+        2013"
     headers:
       Accept:
       - '*/*; q=0.5, application/xml'
@@ -19,29 +16,31 @@ http_interactions:
       Content-Type:
       - text/plain
       Content-Length:
-      - '188'
+      - '157'
       User-Agent:
       - Ruby
   response:
     status:
-      code: 201
-      message: CREATED
+      code: 400
+      message: BAD REQUEST
     headers:
       Date:
-      - Tue, 03 Dec 2013 20:12:49 GMT
+      - Thu, 05 Dec 2013 20:59:04 GMT
       Server:
       - Apache/2.2.17 (Unix) DAV/2 mod_wsgi/3.3 Python/2.7 mod_ssl/2.2.17 OpenSSL/0.9.8o
       Vary:
       - Cookie
       Set-Cookie:
-      - sessionid=qgdajq0j02blold4ukuvom3typ32t4us; httponly; Path=/ezid/
+      - sessionid=ni4j7qfnpcx4w6c37f1jlaqshvt1tmv4; httponly; Path=/ezid/
       Content-Length:
-      - '53'
+      - '72'
+      Connection:
+      - close
       Content-Type:
       - text/plain; charset=UTF-8
     body:
       encoding: UTF-8
-      string: 'success: doi:10.5072/FK2SF37QT | ark:/b5072/fk2sf37qt'
+      string: 'error: bad request - DOI metadata requirements not satisfied: no creator'
     http_version: 
-  recorded_at: Tue, 03 Dec 2013 20:12:52 GMT
+  recorded_at: Thu, 05 Dec 2013 20:59:04 GMT
 recorded_with: VCR 2.8.0

data/spec/internal/spec/fixtures/cassettes/remotely_identified_doi_mint_spam.yml

@@ -5,12 +5,9 @@ http_interactions:
     uri: https://apitest:apitest@n2t.net/ezid/shoulder/doi:10.5072/FK2
     body:
       encoding: UTF-8
-      string: |-
-        _target: http://localhost/show/h415p848p33
-        datacite.creator: info:fedora/sufia:h415p848p2r
-        datacite.title: Title 19
-        datacite.publisher: An Interesting Chap!
-        datacite.publicationyear: 2013
+      string: "_target: http://localhost/show/h415p85421z\ndatacite.creator: \ndatacite.title:
+        Title 19\ndatacite.publisher: An Interesting Chap!\ndatacite.publicationyear:
+        2013"
     headers:
       Accept:
       - '*/*; q=0.5, application/xml'
@@ -19,29 +16,31 @@ http_interactions:
       Content-Type:
       - text/plain
       Content-Length:
-      - '187'
+      - '158'
       User-Agent:
       - Ruby
   response:
     status:
-      code: 201
-      message: CREATED
+      code: 400
+      message: BAD REQUEST
     headers:
       Date:
-      - Tue, 03 Dec 2013 20:28:25 GMT
+      - Thu, 05 Dec 2013 21:08:47 GMT
       Server:
       - Apache/2.2.17 (Unix) DAV/2 mod_wsgi/3.3 Python/2.7 mod_ssl/2.2.17 OpenSSL/0.9.8o
       Vary:
       - Cookie
       Set-Cookie:
-      - sessionid=rnyg7w7b8z9w4tl25oq7lsndlohu4xw1; httponly; Path=/ezid/
+      - sessionid=myy1v7e276rt0dgxrfk61hu16ua2ti8x; httponly; Path=/ezid/
       Content-Length:
-      - '53'
+      - '72'
+      Connection:
+      - close
       Content-Type:
       - text/plain; charset=UTF-8
     body:
       encoding: UTF-8
-      string: 'success: doi:10.5072/FK2NP2H04 | ark:/b5072/fk2np2h04'
+      string: 'error: bad request - DOI metadata requirements not satisfied: no creator'
     http_version: 
-  recorded_at: Tue, 10 Dec 2013 21:26:23 GMT
+  recorded_at: Thu, 12 Dec 2013 21:21:34 GMT
 recorded_with: VCR 2.8.0

data/spec/matchers.rb

@@ -0,0 +1,24 @@
+require 'rspec/matchers'
+
+if defined?($SHOW_MATCHERS)
+  module RSpec::Shim
+    def define(matcher_name, *args, &block)
+      $SHOW_MATCHERS[matcher_name] = caller.first.split(":")[0..1]
+      super
+    end
+    def matcher(matcher_name, *args, &block)
+      $SHOW_MATCHERS[matcher_name] = caller.first.split(":")[0..1]
+      super
+    end
+  end
+
+  RSpec::Matchers.extend(RSpec::Shim)
+end
+
+require 'rspec/matchers/dsl'
+require 'rspec-html-matchers'
+require 'rspec-rails'
+require 'rspec/rails'
+require 'rspec/rails/matchers'
+
+Dir[File.expand_path('../matchers/**/*.rb', __FILE__)].each { |f| require f }

data/spec/repository_models/generic_file_spec.rb

@@ -52,4 +52,15 @@ describe GenericFile do
     it { should respond_to :version_id }
   end
 
+  context '#copy_permissions_from' do
+    let(:work){ FactoryGirl.create(:public_generic_work) }
+    let(:file) { FactoryGirl.create(:generic_file) }
+
+    it 'should copy permissions from the given work' do
+      file.visibility.should_not == "open"
+      file.copy_permissions_from(work)
+      file.visibility.should == "open"
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -2,14 +2,12 @@
 ENV["RAILS_ENV"] ||= 'test'
 
 if ENV['COVERAGE']
-  require 'coveralls'
   require 'simplecov'
 
   ENGINE_ROOT = File.expand_path('../..', __FILE__)
 
   # Out of the box, SimpleCov was looking at file in ENGINE_ROOT/spec/internal;
   # After all that was where Rails was pointed at.
-  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
   SimpleCov.root(ENGINE_ROOT)
   SimpleCov.start 'rails' do
     filters.clear
@@ -23,6 +21,8 @@ end
 
 require File.expand_path("../internal/config/environment.rb",  __FILE__)
 
+require File.expand_path('../matchers', __FILE__)
+
 # Prevent double spec runs under Zeus
 require 'rspec/autorun' unless ENV['RUNNING_VIA_ZEUS']
 
@@ -53,6 +53,7 @@ RSpec.configure do |config|
   config.order = 'random'
 
   config.include Devise::TestHelpers, type: :controller
+  config.include Devise::TestHelpers, type: :view
   config.include InputSupport, type: :input, example_group: {
     file_path: config.escaped_path(%w[spec inputs])
   }

data/spec/support/shared/shared_examples_with_related_works.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 shared_examples 'with_related_works' do
   let(:user) { FactoryGirl.create(:user) }
   let(:person) { FactoryGirl.create(:person) }

data/spec/views/application/_add_to_collection_gui.html.erb_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+describe 'application/add_to_collection_gui' do
+  let(:document)        { double(title: 'A Document',        pid: 'sufia:vwxyz', noid: 'vwxyz') }
+  let(:profile)         { double(title: 'Your Profile',      pid: 'sufia:abcde', noid: 'abcde') }
+  let(:collection)      { double(title: 'A Collection',      pid: 'sufia:12345', noid: '12345') }
+  let(:profile_section) { double(title: 'A Profile Section', pid: 'sufia:56789', noid: '56789') }
+
+  context 'with collections and no profile sections' do
+    before do
+      view.stub(:current_users_profile_sections).and_return([])
+      view.stub(:available_collections).and_return([collection])
+      view.stub(:available_profiles).and_return([])
+
+      render partial: 'add_to_collection_gui', locals: { collectible: document }
+    end
+
+    it 'displays add link; lists collection as an option' do
+      expect(rendered).to include('Your Collections')
+      expect(rendered).to include(collection.pid)
+      expect(rendered).to_not include('Profile Sections')
+      expect(rendered).to have_link('Add to Collection', add_member_form_collections_path(collectible_id: document.pid))
+    end
+  end
+
+  context 'with a profile and profile section' do
+    before do
+      view.stub(:current_users_profile_sections).and_return([profile_section])
+      view.stub(:available_collections).and_return([])
+      view.stub(:available_profiles).and_return([profile])
+
+      render partial: 'add_to_collection_gui', locals: { collectible: document }
+    end
+
+    it 'displays add link; lists profile section as an option' do
+      expect(rendered).to_not include('Your Collections')
+      expect(rendered).to include(profile.pid)
+      expect(rendered).to include('Profile Sections')
+      expect(rendered).to include(profile_section.pid)
+      expect(rendered).to have_link('Add to Collection', add_member_form_collections_path(collectible_id: document.pid))
+    end
+  end
+
+  context 'with no collections and no profile' do
+    before do
+      view.stub(:current_users_profile_sections).and_return([])
+      view.stub(:available_collections).and_return([])
+      view.stub(:available_profiles).and_return([])
+
+      render partial: 'add_to_collection_gui', locals: { collectible: document }
+    end
+
+    it 'displays add link; includes no profile or collections' do
+      expect(rendered).to_not include('Your Collections')
+      expect(rendered).to_not include('Profile Sections')
+      expect(rendered).to have_link('Add to Collection', add_member_form_collections_path(collectible_id: document.pid))
+    end
+  end
+end
+

data/spec/views/curate/collections/_form_to_add_member.html.erb_spec.rb

@@ -1,21 +1,21 @@
 require 'spec_helper'
 
 describe 'curate/collections/_form_to_add_member.html.erb' do
-  let(:collectible) { FactoryGirl.create(:generic_work, user: user) }
-  let(:person) { FactoryGirl.create(:person_with_user) }
-  let(:user) { person.user }
-  let(:profile) { person.profile }
-  let(:profile_section) {double(title: 'Section 1', pid: '123')}
+  let(:profile)         { double(title: 'Your Profile',      pid: 'sufia:abcde', noid: 'abcde') }
+  let(:collectible)     { double(title: 'A Document',        pid: 'sufia:vwxyz', noid: 'vwxyz') }
+  let(:profile_section) { double(title: 'A Profile Section', pid: 'sufia:56789', noid: '56789') }
 
   before do
-    assign :collection_options, [collectible]
-    assign(:available_profiles, view.stub(:available_profiles).and_return([profile]))
-    assign(:current_users_profile_sections, view.stub(:current_users_profile_sections).and_return([profile_section]))
-    render partial: 'form_to_add_member', locals: { collectible: collectible, fieldset_class: 'with-side-padding with-top-padding' }
+    view.stub(:current_users_profile_sections).and_return([profile_section])
+    view.stub(:available_collections).and_return([])
+    view.stub(:available_profiles).and_return([profile])
+
+    render partial: 'form_to_add_member', locals: { collectible: collectible }
   end
 
   it 'should list profile and profile sections in the dropdown menu' do
-    expect(rendered).to have_content(profile.title)
-    expect(rendered).to have_content("Section 1")
+    expect(rendered).to include(profile.title)
+    expect(rendered).to include(profile_section.title)
   end
+
 end

data/spec/views/curation_concern/base/_collection.html.erb_spec.rb

@@ -19,7 +19,6 @@ describe 'curation_concern/base/_collection.html.erb' do
 
     it 'lists all the collections the work is added to' do
       expect(rendered).to include("Collection 1")
-      expect(rendered).to include("Add to Collection")
     end
   end
 
@@ -34,7 +33,6 @@ describe 'curation_concern/base/_collection.html.erb' do
 
     it 'lists all the collections the work is added to' do
       expect(rendered).to include("Collection 1")
-      expect(rendered).not_to include("Add to Collection")
     end
   end
 end

data/spec/views/curation_concern/base/_related_files.html.erb_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper.rb'
+
+describe 'curation_concern/base/_related_files.html.erb' do
+  it 'displays a donload button' do
+    file = stub_model(GenericFile, audit_stat: true, pid: '1234')
+    work = stub_model(GenericWork, pid: '5678')
+    work.generic_files += [file]
+    allow(view).to receive(:can?) { true }
+
+    render partial: 'curation_concern/base/related_files',
+      locals: {curation_concern: work, with_actions: true}
+    
+    expect(rendered).to include(download_path(file.noid))
+  end
+end
+

data/spec/views/curation_concern/base/_representative_media.html.erb_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper.rb'
+
+describe 'curation_concern/base/_representative_media.html.erb' do
+  it 'displays a donload button' do
+    file = stub_model(GenericFile, audit_stat: true, pid: 'curate:foo1')
+    work = stub_model(GenericWork, representative: file.pid)
+    allow(GenericFile).to receive(:load_instance_from_solr).with(file.pid) { file }
+
+    render partial: 'curation_concern/base/representative_media', locals: {work: work}
+    
+    expect(response).to render_template(partial: '_media_display')
+  end
+end
+
+

data/spec/views/curation_concern/base/_thumbnail.html.erb_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper.rb'
+
+describe 'curation_concern/base/_thumbnail.html.erb' do
+  describe 'with an image file' do
+    it 'displays a thumbnail' do
+      img = stub_model(GenericFile, image?: true, pid: 'curate:foo1')
+
+      render(partial: 'thumbnail', locals: {thumbnail: img})
+
+      expect(rendered).to include(download_path(img, {datastream_id: 'thumbnail'}))
+    end
+  end
+
+  describe 'with an audio file' do
+    it 'displays a generic image' do
+      audio_file = stub_model(GenericFile, audit_stat: true, pid: 'curate:foo1', audio?: true)
+
+      render(partial: 'thumbnail', locals: {thumbnail: audio_file})
+
+      expect(rendered).to include(curation_concern_generic_file_path(audio_file.noid))
+    end
+  end
+
+  describe 'with a video file'
+end
+
+

data/spec/views/curation_concern/generic_files/_media_display.html.erb_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper.rb'
+
+describe 'curation_concern/generic_files/_media_display.html.erb' do
+  describe 'with an image file' do
+    it 'displays the image' do
+      img = stub_model(GenericFile, image?: true, pid: 'curate:testfoo')
+
+      render(partial: 'media_display', locals: {generic_file: img})
+
+      expect(rendered).to include(download_path(img))
+    end
+  end
+
+  describe 'with an audio file' do
+    it 'displays an audio player' do
+      audio_file = stub_model(GenericFile, audio?: true, pid: 'curate:testfoo')
+
+      render(partial: 'media_display', locals: {generic_file: audio_file})
+
+      expect(rendered).to include('audio')
+    end
+  end
+
+  describe 'with an unknown file' do
+    it 'displays a placeholder image' do
+      unknown_file = stub_model(GenericFile, pid: 'curate:testfoo')
+
+      render(partial: 'media_display', locals: {generic_file: unknown_file})
+
+      expect(rendered).to include('nope.png')
+    end
+  end
+end
+