sufia 6.0.0.beta1 → 6.0.0.rc1

data/spec/inputs/multi_value_with_help_input_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe 'MultiValueWithHelpInput', type: :input do
+  subject { input_for file, field, { as: :multi_value_with_help, required: true } }
+  let(:file) { GenericFile.new }
+
+  context "when the field has a translation" do
+    let(:field) { :language }
+    it 'renders help icon' do
+      expect(subject).to have_selector('a[rel=popover][data-original-title=Language]')
+      expect(subject).to have_selector('a[rel=popover][data-content="The language of the file content."]')
+      expect(subject).to have_selector('i.help-icon')
+    end
+  end
+
+  context "when the field doesn't have a translation" do
+    let(:field) { :date_modified }
+    it 'renders help icon' do
+      expect(subject).to have_selector('a[rel=popover][data-original-title="Date modified"]')
+      expect(subject).to have_selector('a[rel=popover][data-content="Date modified"]')
+      expect(subject).to have_selector('i.help-icon')
+    end
+  end
+
+end

data/spec/inputs/select_with_modal_help_input_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe 'SelectWithModalHelpInput', type: :input do
+  subject { input_for file, :rights, options }
+  let(:file) { GenericFile.new }
+  let(:base_options) { { as: :select_with_modal_help, required: true, collection: Sufia.config.cc_licenses } }
+  let(:options) { base_options }
+
+  context "when a blank is requested" do
+    let(:options) { base_options.merge(include_blank: true) }
+    it 'renders a blank option' do
+      expect(subject).to have_selector 'select option[value=""]'
+    end
+  end
+
+  context "when a blank is not requested" do
+    it 'has no blanks' do
+      expect(subject).to have_selector 'select option:first-child', text: 'Attribution 3.0 United States'
+    end
+  end
+end

data/spec/jobs/batch_update_job_spec.rb

@@ -20,24 +20,21 @@ describe BatchUpdateJob do
   end
 
   describe "#run" do
-    let(:params) do
-      {
-        generic_file: {
-          read_groups_string: '', read_users_string: 'archivist1, archivist2',
-          tag: ['']
-        },
-        title: { file.id => ['File One'], file2.id => ['File Two'] },
-        id: batch.id,
-        controller: 'batch',
-        action: 'update'
-      }.with_indifferent_access
+    let(:title) { { file.id => ['File One'], file2.id => ['File Two'] }}
+    let(:metadata) do
+      { read_groups_string: '', read_users_string: 'archivist1, archivist2',
+        tag: [''] }.with_indifferent_access
     end
 
+    let(:visibility) { nil }
+
+    let(:job) { BatchUpdateJob.new(user.user_key, batch.id, title, metadata, visibility) }
+
     context "with a failing update" do
       it "should check permissions for each file before updating" do
         expect_any_instance_of(User).to receive(:can?).with(:edit, file).and_return(false)
         expect_any_instance_of(User).to receive(:can?).with(:edit, file2).and_return(false)
-        BatchUpdateJob.new(user.user_key, params).run
+        job.run
         expect(user.mailbox.inbox[0].messages[0].subject).to eq("Batch upload permission denied")
         expect(user.mailbox.inbox[0].messages[0].body).to include("data-content")
         expect(user.mailbox.inbox[0].messages[0].body).to include("These files")
@@ -54,7 +51,7 @@ describe BatchUpdateJob do
         expect(Sufia.queue).to receive(:push).with(s1).once
         expect(ContentUpdateEventJob).to receive(:new).with(file2.id, user.user_key).and_return(s2)
         expect(Sufia.queue).to receive(:push).with(s2).once
-        BatchUpdateJob.new(user.user_key, params).run
+        job.run
         expect(user.mailbox.inbox[0].messages[0].subject).to eq("Batch upload complete")
         expect(user.mailbox.inbox[0].messages[0].body).to include("data-content")
         expect(user.mailbox.inbox[0].messages[0].body).to include("These files")
@@ -64,7 +61,7 @@ describe BatchUpdateJob do
     describe "updates metadata" do
       before do
         allow(Sufia.queue).to receive(:push)
-        BatchUpdateJob.new(user.user_key, params).run
+        job.run
       end
 
       it "should update the titles" do

data/spec/lib/sufia/breadcrumbs_spec.rb

@@ -54,25 +54,63 @@ describe Sufia::Breadcrumbs do
         expect(crumbs.trail_from_referer).to eql([[I18n.t('sufia.bread_crumb.search_results'), referer]])
       end
     end
-    context "when coming from the dashboard" do
+    context "when coming places other than the catalog" do
       before do
-        allow(crumbs.request).to receive(:referer).and_return("http://...dashboard/")
+        allow(crumbs.request).to receive(:referer).and_return("http://...blargh/")
         allow(crumbs).to receive(:user_signed_in?) { true }
+        allow(crumbs).to receive(:action_name).and_return("view")
       end
       specify "the trail goes back to the user's files" do
         allow(crumbs).to receive(:controller_name).and_return("my/files")
-        expect(crumbs.trail_from_referer.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
-        expect(crumbs.trail_from_referer.last).to eql([I18n.t('sufia.dashboard.my.files'), sufia.dashboard_files_path])
+        crumbs.trail_from_referer
+        expect(crumbs.trail.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
+        expect(crumbs.trail.last).to eql([I18n.t('sufia.dashboard.my.files'), sufia.dashboard_files_path])
       end
       specify "the trail goes back to the user's collections" do
         allow(crumbs).to receive(:controller_name).and_return("my/collections")
-        expect(crumbs.trail_from_referer.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
-        expect(crumbs.trail_from_referer.last).to eql([I18n.t('sufia.dashboard.my.collections'), sufia.dashboard_collections_path])
+        crumbs.trail_from_referer
+        expect(crumbs.trail.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
+        expect(crumbs.trail.last).to eql([I18n.t('sufia.dashboard.my.collections'), sufia.dashboard_collections_path])
       end
       specify "the trail goes back to the user's files when on the batch edit page" do
         allow(crumbs).to receive(:controller_name).and_return("batch_edit")
-        expect(crumbs.trail_from_referer.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
-        expect(crumbs.trail_from_referer.last).to eql([I18n.t('sufia.dashboard.my.files'), sufia.dashboard_files_path])
+        crumbs.trail_from_referer
+        expect(crumbs.trail.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
+        expect(crumbs.trail.last).to eql([I18n.t('sufia.dashboard.my.files'), sufia.dashboard_files_path])
+      end
+    end
+
+    context "when editing a file" do
+      before do
+        allow(crumbs.request).to receive(:referer).and_return("http://...blargh/")
+        allow(crumbs).to receive(:user_signed_in?) { true }
+        allow(crumbs).to receive(:action_name).and_return("edit")
+        allow(crumbs).to receive(:params).and_return({"id" => "abc123"})
+        allow(crumbs).to receive(:controller_name).and_return("generic_files")
+      end
+
+      specify "the trail goes back to the user's files and the browse view" do
+        crumbs.trail_from_referer
+        expect(crumbs.trail.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
+        expect(crumbs.trail[1]).to eql([I18n.t('sufia.dashboard.my.files'), sufia.dashboard_files_path])
+        expect(crumbs.trail.last).to eql([I18n.t('sufia.generic_file.browse_view'), sufia.generic_file_path("abc123")])
+      end
+    end
+
+    context "when viewing file statistics" do
+      before do
+        allow(crumbs.request).to receive(:referer).and_return("http://...blargh/")
+        allow(crumbs).to receive(:user_signed_in?) { true }
+        allow(crumbs).to receive(:action_name).and_return("stats")
+        allow(crumbs).to receive(:params).and_return({"id" => "abc123"})
+        allow(crumbs).to receive(:controller_name).and_return("generic_files")
+      end
+
+      specify "the trail goes back to the user's files and the browse view" do
+        crumbs.trail_from_referer
+        expect(crumbs.trail.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
+        expect(crumbs.trail[1]).to eql([I18n.t('sufia.dashboard.my.files'), sufia.dashboard_files_path])
+        expect(crumbs.trail.last).to eql([I18n.t('sufia.generic_file.browse_view'), sufia.generic_file_path("abc123")])
       end
     end
   end

data/spec/models/generic_file_spec.rb

@@ -528,19 +528,6 @@ describe GenericFile, :type => :model do
     end
   end
 
-  describe "#remove_blank_assertions" do
-    before do
-      subject.title = ["foo"]
-      subject.description = [""]
-      subject.remove_blank_assertions
-    end
-
-    it "should only change title" do
-      expect(subject.title).to eq(["foo"])
-      expect(subject.description).to be_empty
-    end
-  end
-
   describe "to_solr record" do
     let(:depositor) { 'jcoyne' }
     subject do

data/spec/models/user_spec.rb

@@ -20,6 +20,29 @@ describe User, :type => :model do
     expect(user).to respond_to(:facebook_handle)
     expect(user).to respond_to(:googleplus_handle)
     expect(user).to respond_to(:linkedin_handle)
+    expect(user).to respond_to(:orcid)
+  end
+  describe 'ORCID validation and normalization' do
+    it 'saves when a valid bare ORCID is supplied' do
+      user.orcid = '0000-0000-1111-2222'
+      expect(user).to be_valid
+      expect(user.save).to be true
+    end
+    it 'saves when a valid ORCID URI is supplied' do
+      user.orcid = 'http://orcid.org/0000-0000-1111-2222'
+      expect(user).to be_valid
+      expect(user.save).to be true
+    end
+    it 'normalizes bare ORCIDs to URIs' do
+      user.orcid = '0000-0000-1111-2222'
+      user.save
+      expect(user.orcid).to eq 'http://orcid.org/0000-0000-1111-2222'
+    end
+    it 'marks bad ORCIDs as invalid' do
+      user.orcid = '000-000-111-222'
+      expect(user).not_to be_valid
+      expect(user.save).to be false
+    end
   end
 
   describe "#to_param" do

data/spec/presenters/presenter_renderer_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Sufia::PresenterRenderer, type: :view do
+  let(:generic_file) { GenericFile.new }
+  let(:presenter) { Sufia::GenericFilePresenter.new(generic_file) }
+  let(:renderer) { Sufia::PresenterRenderer.new(presenter, view) }
+
+  describe "#label" do
+    context "of a field with a translation" do
+      subject { renderer.label(:date_created) }
+      it { is_expected.to eq 'Date Created' }
+    end
+
+    context "of a field without a translation" do
+      subject { renderer.label(:date_uploaded) }
+      it { is_expected.to eq 'Date uploaded' }
+    end
+  end
+end

data/spec/presenters/sufia/generic_file_presenter_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Sufia::GenericFilePresenter do
+  describe "#terms" do
+    it "should return a list" do
+      expect(described_class.terms).to eq([:resource_type, :title,
+        :creator, :contributor, :description, :tag, :rights, :publisher,
+        :date_created, :subject, :language, :identifier, :based_near,
+        :related_url])
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -20,6 +20,7 @@ require 'equivalent-xml'
 require 'equivalent-xml/rspec_matchers'
 require 'database_cleaner'
 require 'support/features'
+require 'support/input_support'
 require 'byebug' unless ENV['TRAVIS']
 
 if ENV['COVERAGE']
@@ -124,6 +125,10 @@ RSpec.configure do |config|
 
   config.include Warden::Test::Helpers, type: :feature
   config.after(:each, type: :feature) { Warden.test_reset! }
+
+  config.include InputSupport, type: :input
+  config.include Capybara::RSpecMatchers, type: :input
+
   config.infer_spec_type_from_file_location!
 end
 

data/spec/support/input_support.rb

@@ -0,0 +1,12 @@
+module InputSupport
+  extend ActiveSupport::Concern
+
+  include RSpec::Rails::HelperExampleGroup
+
+  def input_for(object, attribute_name, options={})
+    helper.simple_form_for object, url: '' do |f|
+      f.input attribute_name, options
+    end
+  end
+end
+

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -36,5 +36,5 @@ class TestAppGenerator < Rails::Generators::Base
     gsub_file 'app/assets/javascripts/application.js',
               '//= require_tree .', '//= require sufia'
   end
-    
+
 end

data/spec/views/batch/edit.html.erb_spec.rb

@@ -1,48 +1,38 @@
 require 'spec_helper'
 
-describe 'batch/edit.html.erb', :type => :view do
-  let( :batch ) {
-    stub_model(Batch, id: '123')
-  }
-
-  let(:content) { double('content', versions: [], mimeType: 'application/pdf') }
-  let(:generic_file) {
-    stub_model(GenericFile, id: '321', noid: '321', depositor: 'bob', rights: [''])
-  }
-
+describe 'batch/edit.html.erb' do
+  let(:batch) { stub_model(Batch, id: '123') }
+  let(:generic_file) { stub_model(GenericFile, id: nil, depositor: 'bob', rights: ['']) }
+  let(:form) { Sufia::Forms::BatchEditForm.new(generic_file) }
 
   before do
-    allow(generic_file).to receive(:content).and_return(content)
     allow(controller).to receive(:current_user).and_return(stub_model(User))
-    controller.request.path_parameters[:id] = "123"
     assign :batch, batch
-    assign :generic_file, generic_file
+    assign :form, form
     render
-    @page = Capybara::Node::Simple.new(rendered)
   end
 
   it "should draw tooltip for visibility" do
-    expect(@page).to have_selector("span#visibility_tooltip", count: 1)
-    expect(@page).to have_selector("a#generic_file_visibility_help", count: 1)
+    expect(rendered).to have_selector "span#visibility_tooltip a i.help-icon"
   end
 
   it "should draw tooltip for share_with" do
-    expect(@page).to have_selector("span#share_with_tooltip", count: 1)
-    expect(@page).to have_selector("a#generic_file_share_with_help", count: 1)
+    expect(rendered).to have_selector "span#share_with_tooltip a i.help-icon"
   end
 
   context "rights" do
     it "should have a modal" do
-      expect(@page).to have_selector("div#rightsModal .modal-dialog .modal-content")
+      expect(rendered).to have_selector("div#rightsModal .modal-dialog .modal-content")
     end
 
     it "should allow setting many rights" do
-      expect(@page).to have_selector('select#generic_file_rights[name="generic_file[rights][]"]')
+      expect(rendered).to have_selector('select#generic_file_rights[name="generic_file[rights][]"]')
     end
-  
+
     it "should not have an empty rights element" do
-      @page.all('select#generic_file_rights option').each do |elem| 
-        expect(elem.value).to_not be_empty 
+      page = Capybara::Node::Simple.new(rendered)
+      page.all('select#generic_file_rights option').each do |elem|
+        expect(elem.value).to_not be_empty
       end
     end
   end

data/spec/views/batch_edits/edit.html.erb_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe 'batch_edits/edit.html.erb' do
+  let(:generic_file) { stub_model(GenericFile, id: nil, depositor: 'bob', rights: ['']) }
+
+  before do
+    allow(controller).to receive(:current_user).and_return(stub_model(User))
+    assign :names, ['title 1', 'title 2']
+    assign :terms, [:description, :rights]
+    assign :generic_file, generic_file
+    render
+  end
+
+  it "should draw tooltip for description" do
+    expect(rendered).to have_selector ".generic_file_description a i.help-icon"
+  end
+end
+
+

data/spec/views/collections/_form.html.erb_spec.rb

@@ -1,34 +1,32 @@
 require 'spec_helper'
 
-describe 'collections/_form.html.erb', :type => :view do
-  describe 'when the collection edit form is rendered' do
-    let(:collection) { Collection.new(title: 'the title', description: 'the description',
-                                       creator: ['the creator'])}
+describe 'collections/_form.html.erb' do
+  let(:collection) { Collection.new(title: 'the title', description: 'the description',
+                                     creator: ['the creator'])}
 
-    before do
-      controller.request.path_parameters[:id] = 'j12345'
-      collection.initialize_fields
-      assign(:collection, collection)
-    end
+  let(:collection_form) { Sufia::Forms::CollectionEditForm.new(collection) }
 
-    it "should draw the metadata fields for collection" do
-      render
-      expect(rendered).to have_selector("input#collection_title", count: 1)
-      expect(rendered).to_not have_selector("div#additional_title_clone button.adder")
-      expect(rendered).to have_selector("input#collection_creator", count: 1)
-      expect(rendered).to have_selector("div#additional_creator_clone button.adder")
-      expect(rendered).to have_selector("textarea#collection_description", count: 1)
-      expect(rendered).to have_selector("input#collection_contributor", count: 1)
-      expect(rendered).to have_selector("input#collection_tag", count: 1)
-      expect(rendered).to have_selector("input#collection_subject", count: 1)
-      expect(rendered).to have_selector("input#collection_publisher", count: 1)
-      expect(rendered).to have_selector("input#collection_date_created", count: 1)
-      expect(rendered).to have_selector("input#collection_language", count: 1)
-      expect(rendered).to have_selector("input#collection_identifier", count: 1)
-      expect(rendered).to have_selector("input#collection_based_near", count: 1)
-      expect(rendered).to have_selector("input#collection_related_url", count: 1)
-      expect(rendered).to have_selector("select#collection_rights", count: 1)
-      expect(rendered).to have_selector("select#collection_resource_type", count: 1)
-    end
+  before do
+    controller.request.path_parameters[:id] = 'j12345'
+    assign(:form, collection_form)
+  end
+
+  it "should draw the metadata fields for collection" do
+    render
+    expect(rendered).to have_selector("input#collection_title")
+    expect(rendered).to_not have_selector("div#additional_title.multi_value")
+    expect(rendered).to have_selector("input#collection_creator.multi_value")
+    expect(rendered).to have_selector("textarea#collection_description")
+    expect(rendered).to have_selector("input#collection_contributor")
+    expect(rendered).to have_selector("input#collection_tag")
+    expect(rendered).to have_selector("input#collection_subject")
+    expect(rendered).to have_selector("input#collection_publisher")
+    expect(rendered).to have_selector("input#collection_date_created")
+    expect(rendered).to have_selector("input#collection_language")
+    expect(rendered).to have_selector("input#collection_identifier")
+    expect(rendered).to have_selector("input#collection_based_near")
+    expect(rendered).to have_selector("input#collection_related_url")
+    expect(rendered).to have_selector("select#collection_rights")
+    expect(rendered).to have_selector("select#collection_resource_type")
   end
 end