sufia 6.2.0 → 6.3.0

data/spec/features/search_spec.rb

@@ -4,7 +4,7 @@ describe 'searching' do
   let!(:file) { FactoryGirl.create(:public_file, title: ["Toothbrush"]) }
 
   context "as a public user" do
-    it "should find the file and have a gallery" do
+    it "finds the file and have a gallery" do
       visit '/'
       fill_in "search-field-header", with: "Toothbrush"
       click_button "search-submit-header"
@@ -12,7 +12,7 @@ describe 'searching' do
       within "#search-results" do
         expect(page).to have_content "Toothbrush"
       end
-      
+
       click_link "Gallery"
       expect(page).to have_content "You searched for: Toothbrush"
       within "#documents" do
@@ -20,7 +20,7 @@ describe 'searching' do
       end
     end
 
-    it "should not display search options for dashboard files" do
+    it "does not display search options for dashboard files" do
       visit "/"
       within(".input-group-btn") do
         expect(page).to_not have_content("My Files")
@@ -28,6 +28,5 @@ describe 'searching' do
         expect(page).to_not have_content("My Shares")
       end
     end
-
   end
 end

data/spec/features/single_use_links_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Create and use single-use links", :type => :feature do
+describe "Create and use single-use links", type: :feature do
   include Warden::Test::Helpers
   Warden.test_mode!
   include Sufia::Engine.routes.url_helpers

data/spec/features/users_spec.rb

@@ -1,13 +1,12 @@
 require 'spec_helper'
 
-describe "User Profile", :type => :feature do
-
+describe "User Profile", type: :feature do
   before do
     sign_in FactoryGirl.create(:curator)
   end
 
   context 'when visiting user profile' do
-    it 'should render page properly' do
+    it 'renders page properly' do
       visit '/users/curator1@example-dot-com'
       expect(page).to have_content('curator1@example.com')
       expect(page).to have_content('Edit Your Profile')
@@ -15,7 +14,7 @@ describe "User Profile", :type => :feature do
   end
 
   context 'when clicking all users' do
-    it 'should display all users' do
+    it 'displays all users' do
       visit '/users/curator1@example-dot-com'
       click_link 'View Users'
       expect(page).to have_xpath("//td/a[@href='/users/curator1@example-dot-com']")
@@ -35,7 +34,7 @@ describe "User Profile", :type => :feature do
   end
 
   context 'user profile' do
-    it 'should be searchable' do
+    it 'is searchable' do
       @archivist = FactoryGirl.find_or_create(:archivist)
       visit '/users/curator1@example-dot-com'
       click_link 'View Users'

data/spec/forms/collection_edit_form_spec.rb

@@ -5,7 +5,7 @@ describe Sufia::Forms::CollectionEditForm do
   let(:form) { described_class.new(collection) }
 
   describe "#terms" do
-    subject { form.terms}
+    subject { form.terms }
     it { is_expected.to eq [:resource_type, :title, :creator, :contributor, :description,
                             :tag, :rights, :publisher, :date_created, :subject, :language,
                             :identifier, :based_near, :related_url] }
@@ -13,7 +13,7 @@ describe Sufia::Forms::CollectionEditForm do
 
   describe "unique?" do
     context "with :title" do
-      subject { Sufia::Forms::CollectionEditForm.unique?(:title) }
+      subject { described_class.unique?(:title) }
       it { is_expected.to be true }
     end
   end

data/spec/forms/generic_file_edit_form_spec.rb

@@ -4,9 +4,9 @@ describe Sufia::Forms::GenericFileEditForm do
   subject { described_class.new(GenericFile.new) }
 
   describe "#terms" do
-    it "should return a list" do
+    it "returns a list" do
       expect(subject.terms).to eq([:resource_type, :title, :creator, :contributor, :description, :tag,
-                    :rights, :publisher, :date_created, :subject, :language, :identifier, :based_near, :related_url])
+                                   :rights, :publisher, :date_created, :subject, :language, :identifier, :based_near, :related_url])
     end
 
     it "doesn't contain fields that users shouldn't be allowed to edit" do
@@ -15,19 +15,18 @@ describe Sufia::Forms::GenericFileEditForm do
     end
   end
 
-  it "should initialize multivalued fields" do
+  it "initializes multivalued fields" do
     expect(subject.title).to eq ['']
   end
 
   describe ".model_attributes" do
-    let(:params) { ActionController::Parameters.new(title: ['foo'], description: [''], "permissions_attributes"=>{"2"=>{"access"=>"edit", "_destroy"=>"true", "id"=>"a987551e-b87f-427a-8721-3e5942273125"}})}
+    let(:params) { ActionController::Parameters.new(title: ['foo'], description: [''], "permissions_attributes" => { "2" => { "access" => "edit", "_destroy" => "true", "id" => "a987551e-b87f-427a-8721-3e5942273125" } }) }
     subject { described_class.model_attributes(params) }
 
-    it "should only change title" do
+    it "onlies change title" do
       expect(subject['title']).to eq ["foo"]
       expect(subject['description']).to be_empty
-      expect(subject['permissions_attributes']).to eq("2" => {"access"=>"edit", "id"=>"a987551e-b87f-427a-8721-3e5942273125", "_destroy"=>"true"})
+      expect(subject['permissions_attributes']).to eq("2" => { "access" => "edit", "id" => "a987551e-b87f-427a-8721-3e5942273125", "_destroy" => "true" })
     end
   end
-
 end

data/spec/helpers/batch_edits_helper_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
-describe BatchEditsHelper, :type => :helper do
-
+describe BatchEditsHelper, type: :helper do
   describe "#render_check_all" do
-
     before do
       @document_list = ["doc1", "doc2"]
       @batch_size_on_other_page = 1
@@ -11,34 +9,32 @@ describe BatchEditsHelper, :type => :helper do
     end
 
     context "with my files" do
-      it "should show the check all dropdown" do
-        allow(helper).to receive(:params).and_return({ controller: "my/files" })
+      it "shows the check all dropdown" do
+        allow(helper).to receive(:params).and_return(controller: "my/files")
         allow(helper).to receive(:controller_name).and_return("batch_edits")
         expect(helper.render_check_all).to have_css("span.glyphicon-cog")
       end
 
-      it "should show my action menu for my controller" do
-        allow(helper).to receive(:params).and_return({ controller: "my" })
+      it "shows my action menu for my controller" do
+        allow(helper).to receive(:params).and_return(controller: "my")
         allow(helper).to receive(:controller_name).and_return("my")
         expect(helper.render_check_all).not_to have_content("ABC")
       end
     end
 
     context "with my collections" do
-      it "should not show the check all dropdown" do
-        allow(helper).to receive(:params).and_return({ controller: "my/collections" })
+      it "does not show the check all dropdown" do
+        allow(helper).to receive(:params).and_return(controller: "my/collections")
         expect(helper.render_check_all).to be_nil
       end
     end
 
     context "with select all disabled" do
-      it "should not show the check all dropdown" do
-        allow(helper).to receive(:params).and_return({ controller: "foo" })
+      it "does not show the check all dropdown" do
+        allow(helper).to receive(:params).and_return(controller: "foo")
         assign(:disable_select_all, true)
         expect(helper.render_check_all).to have_css("input[disabled=disabled]")
       end
     end
-
   end
-
 end

data/spec/helpers/content_block_helper_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ContentBlockHelper, :type => :helper do
+describe ContentBlockHelper, type: :helper do
   let(:content_block) { FactoryGirl.create(:content_block, value: "<p>foo bar</p>") }
 
   subject { helper.editable_content_block(content_block) }
@@ -12,7 +12,7 @@ describe ContentBlockHelper, :type => :helper do
       end
       let(:node) { Capybara::Node::Simple.new(subject) }
 
-      it "should show the preview and the form" do
+      it "shows the preview and the form" do
         expect(node).to have_selector "button[data-target='#edit_content_block_1'][data-behavior='reveal-editor']"
         expect(node).to have_selector "form#edit_content_block_1[action='#{sufia.content_block_path(content_block)}']"
         expect(subject).to be_html_safe
@@ -33,7 +33,7 @@ describe ContentBlockHelper, :type => :helper do
     before do
       expect(helper).to receive(:can?).with(:update, content_block).and_return(false)
     end
-    it "should show the content" do
+    it "shows the content" do
       expect(subject).to eq '<p>foo bar</p>'
       expect(subject).to be_html_safe
     end

data/spec/helpers/dashboard_helper_spec.rb

@@ -1,10 +1,9 @@
 require 'spec_helper'
 
-describe DashboardHelper, :type => :helper do
-
+describe DashboardHelper, type: :helper do
   describe "#render_recent_activity" do
     context "when there is no activity" do
-      it "should return a messages stating the user has no recent activity" do
+      it "returns a messages stating the user has no recent activity" do
         assign(:activity, [])
         expect(helper.render_recent_activity).to include("no recent activity")
       end
@@ -13,7 +12,7 @@ describe DashboardHelper, :type => :helper do
 
   describe "#render_recent_notifications" do
     context "when there are no notifications" do
-      it "should return a messages stating the user has no recent notifications" do
+      it "returns a messages stating the user has no recent notifications" do
         assign(:notifications, [])
         expect(helper.render_recent_notifications).to include("no notifications")
       end
@@ -21,35 +20,34 @@ describe DashboardHelper, :type => :helper do
   end
 
   describe "#on_the_dashboard?" do
-    it "should return false for controllers that aren't a part of the dashboard" do
-      allow(helper).to receive(:params).and_return({ controller: "foo" })
+    it "returns false for controllers that aren't a part of the dashboard" do
+      allow(helper).to receive(:params).and_return(controller: "foo")
       expect(helper).to_not be_on_the_dashboard
     end
 
-    it "should return true for controllers that are part of the dashboard" do
-      allow(helper).to receive(:params).and_return({ controller: "my/files" })
+    it "returns true for controllers that are part of the dashboard" do
+      allow(helper).to receive(:params).and_return(controller: "my/files")
       expect(helper).to be_on_the_dashboard
-      allow(helper).to receive(:params).and_return({ controller: "my/collections" })
+      allow(helper).to receive(:params).and_return(controller: "my/collections")
       expect(helper).to be_on_the_dashboard
-      allow(helper).to receive(:params).and_return({ controller: "my/highlights" })
+      allow(helper).to receive(:params).and_return(controller: "my/highlights")
       expect(helper).to be_on_the_dashboard
-      allow(helper).to receive(:params).and_return({ controller: "my/shares" })
+      allow(helper).to receive(:params).and_return(controller: "my/shares")
       expect(helper).to be_on_the_dashboard
     end
   end
 
   describe "#on_my_files" do
-    it "should return false when the controller isn't my files" do
-      allow(helper).to receive(:params).and_return({ controller: "my/collections" })
+    it "returns false when the controller isn't my files" do
+      allow(helper).to receive(:params).and_return(controller: "my/collections")
       expect(helper).to_not be_on_my_files
     end
-    it "should return true when the controller is my files" do
-      allow(helper).to receive(:params).and_return({ controller: "my/files" })
+    it "returns true when the controller is my files" do
+      allow(helper).to receive(:params).and_return(controller: "my/files")
       expect(helper).to be_on_my_files
     end
   end
 
-
   describe "#number_of_files" do
     let(:conn) { ActiveFedora::SolrService.instance.conn }
     let(:user1) { User.new(email: "abc@test") }
@@ -61,7 +59,6 @@ describe DashboardHelper, :type => :helper do
     it "finds only 3 files" do
       expect(helper.number_of_files(user1)).to eq(3)
     end
-
   end
 
   describe "#number_of_collections" do
@@ -75,20 +72,18 @@ describe DashboardHelper, :type => :helper do
     it "finds only 3 files" do
       expect(helper.number_of_collections(user1)).to eq(3)
     end
-
   end
 
-  def create_models (model, user1, user2)
+  def create_models(model, user1, user2)
     # deposited by the first user
     3.times do |t|
-      conn.add  id: "199#{t}", Solrizer.solr_name('depositor', :stored_searchable) => user1.user_key, "has_model_ssim"=>[model],
-          Solrizer.solr_name('depositor', :symbol) => user1.user_key
+      conn.add id: "199#{t}", Solrizer.solr_name('depositor', :stored_searchable) => user1.user_key, "has_model_ssim" => [model],
+               Solrizer.solr_name('depositor', :symbol) => user1.user_key
     end
 
     # deposited by the second user, but editable by the first
-    conn.add  id: "1994", Solrizer.solr_name('depositor', :stored_searchable) => user2.user_key, "has_model_ssim"=>[model],
-        Solrizer.solr_name('depositor', :symbol) => user2.user_key, "edit_access_person_ssim" =>user1.user_key
+    conn.add id: "1994", Solrizer.solr_name('depositor', :stored_searchable) => user2.user_key, "has_model_ssim" => [model],
+             Solrizer.solr_name('depositor', :symbol) => user2.user_key, "edit_access_person_ssim" => user1.user_key
     conn.commit
   end
-
 end

data/spec/helpers/generic_file_helper_spec.rb

@@ -1,33 +1,31 @@
 require 'spec_helper'
 
 describe GenericFileHelper do
-
   describe "#render_collection_list" do
     context "using a file that is part of a collection" do
-
       let(:collection) do
         mock_model(Collection, title: "Foo Collection")
       end
 
       let(:gf) do
-        mock_model(GenericFile, { collections: [collection, collection] })
+        mock_model(GenericFile, collections: [collection, collection])
       end
 
       let(:link) do
         "<a href=\"/collections/#{collection.id}\">#{collection.title}</a>"
       end
 
-      it "should display a comma-delimited list of collections" do
-        expect(helper.render_collection_list(gf)).to eq("Is part of: " + [link,link].join(", "))
+      it "displays a comma-delimited list of collections" do
+        expect(helper.render_collection_list(gf)).to eq("Is part of: " + [link, link].join(", "))
       end
     end
 
     context "using a file that is not part of a collection" do
       let(:gf) do
-        mock_model(GenericFile, { collections: [] })
+        mock_model(GenericFile, collections: [])
       end
 
-      it "should render nothing" do
+      it "renders nothing" do
         expect(helper.render_collection_list(gf)).to be_nil
       end
     end

data/spec/helpers/sufia_helper_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
-describe SufiaHelper, :type => :helper do
-
+describe SufiaHelper, type: :helper do
   describe "#link_to_facet_list" do
     before do
       allow(helper).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)
@@ -10,9 +9,9 @@ describe SufiaHelper, :type => :helper do
     context "with values" do
       subject { helper.link_to_facet_list(['car', 'truck'], 'vehicle_type') }
 
-      it "should join the values" do
-        car_link = catalog_index_path(f: {'vehicle_type_sim' => ['car']})
-        truck_link = catalog_index_path(f: {'vehicle_type_sim' => ['truck']})
+      it "joins the values" do
+        car_link = catalog_index_path(f: { 'vehicle_type_sim' => ['car'] })
+        truck_link = catalog_index_path(f: { 'vehicle_type_sim' => ['truck'] })
         expect(subject).to eq "<a href=\"#{car_link}\">car</a>, <a href=\"#{truck_link}\">truck</a>"
         expect(subject).to be_html_safe
       end
@@ -21,7 +20,7 @@ describe SufiaHelper, :type => :helper do
     context "without values" do
       subject { helper.link_to_facet_list([], 'vehicle_type') }
 
-      it "should show the default text" do
+      it "shows the default text" do
         expect(subject).to eq "No value entered"
       end
     end
@@ -30,36 +29,36 @@ describe SufiaHelper, :type => :helper do
   describe "has_collection_search_parameters?" do
     subject { helper }
     context "when cq is set" do
-      before { allow(helper).to receive(:params).and_return({ cq: 'foo'}) }
+      before { allow(helper).to receive(:params).and_return(cq: 'foo') }
       it { is_expected.to have_collection_search_parameters }
     end
 
     context "when cq is not set" do
-      before { allow(helper).to receive(:params).and_return({ cq: ''}) }
+      before { allow(helper).to receive(:params).and_return(cq: '') }
       it { is_expected.not_to have_collection_search_parameters }
     end
   end
 
   describe "sufia_thumbnail_tag" do
     context "for an image object" do
-      let(:document) { SolrDocument.new( mime_type_tesim: 'image/jpeg', id: '1234' ) }
-      it "should show the audio thumbnail" do
-        rendered = helper.sufia_thumbnail_tag(document, { width: 90 })
+      let(:document) { SolrDocument.new(mime_type_tesim: 'image/jpeg', id: '1234') }
+      it "shows the audio thumbnail" do
+        rendered = helper.sufia_thumbnail_tag(document, width: 90)
         expect(rendered).to match(/src="\/downloads\/1234\?file=thumbnail"/)
         expect(rendered).to match(/width="90"/)
       end
     end
     context "for an audio object" do
-      let(:document) { SolrDocument.new( mime_type_tesim: 'audio/x-wave', id: '1234') }
-      it "should show the audio thumbnail" do
+      let(:document) { SolrDocument.new(mime_type_tesim: 'audio/x-wave', id: '1234') }
+      it "shows the audio thumbnail" do
         rendered = helper.sufia_thumbnail_tag(document, {})
         expect(rendered).to match(/src="\/assets\/audio.png"/)
       end
     end
     context "for an document object" do
-      let(:document) { SolrDocument.new( mime_type_tesim: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', id: '1234') }
-      it "should show the default thumbnail" do
-        rendered = helper.sufia_thumbnail_tag(document, { width: 90 })
+      let(:document) { SolrDocument.new(mime_type_tesim: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', id: '1234') }
+      it "shows the default thumbnail" do
+        rendered = helper.sufia_thumbnail_tag(document, width: 90)
         expect(rendered).to match(/src="\/downloads\/1234\?file=thumbnail"/)
         expect(rendered).to match(/width="90"/)
       end
@@ -67,101 +66,93 @@ describe SufiaHelper, :type => :helper do
   end
 
   describe "#link_to_telephone" do
-
     before do
       @user = mock_model(User)
       allow(@user).to receive(:telephone).and_return('867-5309')
     end
 
     context "when @user is set" do
-      it "should return a link to the user's telephone" do
+      it "returns a link to the user's telephone" do
         expect(helper.link_to_telephone).to eq("<a href=\"wtai://wp/mc;867-5309\">867-5309</a>")
       end
     end
 
     context "when @user is not set" do
-      it "should return a link to the user's telephone" do
+      it "returns a link to the user's telephone" do
         expect(helper.link_to_telephone(@user)).to eq("<a href=\"wtai://wp/mc;867-5309\">867-5309</a>")
       end
     end
-
   end
 
   describe "#current_search_parameters" do
-
     context "when the user is not in the dashboard" do
-      it "should be whatever q is" do
-        allow(helper).to receive(:params).and_return({ controller: "catalog", q: "foo" })
+      it "is whatever q is" do
+        allow(helper).to receive(:params).and_return(controller: "catalog", q: "foo")
         expect(helper.current_search_parameters).to eq("foo")
       end
     end
 
     context "when the user is on any dashboard page" do
-
-      it "should be ignored on dashboard" do
-        allow(helper).to receive(:params).and_return({ controller: "dashboard", q: "foo" })
+      it "is ignored on dashboard" do
+        allow(helper).to receive(:params).and_return(controller: "dashboard", q: "foo")
         expect(helper.current_search_parameters).to be_nil
       end
 
-      it "should be ignored on dashboard files, collections, highlights and shares" do
-        allow(helper).to receive(:params).and_return({ controller: "my/files", q: "foo" })
+      it "is ignored on dashboard files, collections, highlights and shares" do
+        allow(helper).to receive(:params).and_return(controller: "my/files", q: "foo")
         expect(helper.current_search_parameters).to be_nil
-        allow(helper).to receive(:params).and_return({ controller: "my/collections", q: "foo" })
+        allow(helper).to receive(:params).and_return(controller: "my/collections", q: "foo")
         expect(helper.current_search_parameters).to be_nil
-        allow(helper).to receive(:params).and_return({ controller: "my/highlights", q: "foo" })
+        allow(helper).to receive(:params).and_return(controller: "my/highlights", q: "foo")
         expect(helper.current_search_parameters).to be_nil
-        allow(helper).to receive(:params).and_return({ controller: "my/shares", q: "foo" })
+        allow(helper).to receive(:params).and_return(controller: "my/shares", q: "foo")
         expect(helper.current_search_parameters).to be_nil
       end
-
     end
-
   end
 
   describe "#search_form_action" do
-
     context "when the user is not in the dashboard" do
-      it "should return the catalog index path" do
-        allow(helper).to receive(:params).and_return({ controller: "foo" })
+      it "returns the catalog index path" do
+        allow(helper).to receive(:params).and_return(controller: "foo")
         expect(helper.search_form_action).to eq(catalog_index_path)
       end
     end
 
     context "when the user is on the dashboard page" do
-      it "should default to My Files" do
-        allow(helper).to receive(:params).and_return({ controller: "dashboard" })
+      it "defaults to My Files" do
+        allow(helper).to receive(:params).and_return(controller: "dashboard")
         expect(helper.search_form_action).to eq(sufia.dashboard_files_path)
       end
     end
 
     context "when the user is on the my files page" do
-      it "should return the my dashboard files path" do
-        allow(helper).to receive(:params).and_return({ controller: "my/files" })
+      it "returns the my dashboard files path" do
+        allow(helper).to receive(:params).and_return(controller: "my/files")
         expect(helper.search_form_action).to eq(sufia.dashboard_files_path)
       end
     end
 
     context "when the user is on the my collections page" do
-      it "should return the my dashboard collections path" do
-        allow(helper).to receive(:params).and_return({ controller: "my/collections" })
+      it "returns the my dashboard collections path" do
+        allow(helper).to receive(:params).and_return(controller: "my/collections")
         expect(helper.search_form_action).to eq(sufia.dashboard_collections_path)
       end
     end
 
     context "when the user is on the my highlights page" do
-      it "should return the my dashboard highlights path" do
-        allow(helper).to receive(:params).and_return({ controller: "my/highlights" })
+      it "returns the my dashboard highlights path" do
+        allow(helper).to receive(:params).and_return(controller: "my/highlights")
         expect(helper.search_form_action).to eq(sufia.dashboard_highlights_path)
       end
     end
 
     context "when the user is on the my shares page" do
-      it "should return the my dashboard shares path" do
-        allow(helper).to receive(:params).and_return({ controller: "my/shares" })
+      it "returns the my dashboard shares path" do
+        allow(helper).to receive(:params).and_return(controller: "my/shares")
         expect(helper.search_form_action).to eq(sufia.dashboard_shares_path)
       end
     end
-
   end
 
   describe '#zotero_label' do
@@ -182,19 +173,17 @@ describe SufiaHelper, :type => :helper do
       expect(helper.number_of_deposits(user1)).to eq(3)
     end
 
-    def create_models (model, user1, user2)
+    def create_models(model, user1, user2)
       # deposited by the first user
       3.times do |t|
-        conn.add  id: "199#{t}", Solrizer.solr_name('depositor', :stored_searchable) => user1.user_key, "has_model_ssim"=>[model],
-            Solrizer.solr_name('depositor', :symbol) => user1.user_key
+        conn.add id: "199#{t}", Solrizer.solr_name('depositor', :stored_searchable) => user1.user_key, "has_model_ssim" => [model],
+                 Solrizer.solr_name('depositor', :symbol) => user1.user_key
       end
 
       # deposited by the second user, but editable by the first
-      conn.add  id: "1994", Solrizer.solr_name('depositor', :stored_searchable) => user2.user_key, "has_model_ssim"=>[model],
-          Solrizer.solr_name('depositor', :symbol) => user2.user_key, "edit_access_person_ssim" =>user1.user_key
+      conn.add id: "1994", Solrizer.solr_name('depositor', :stored_searchable) => user2.user_key, "has_model_ssim" => [model],
+               Solrizer.solr_name('depositor', :symbol) => user2.user_key, "edit_access_person_ssim" => user1.user_key
       conn.commit
     end
-
   end
-
 end