sufia 6.2.0 → 6.3.0

data/spec/features/browse_files_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
-describe "Browse files", :type => :feature do
-
+describe "Browse files", type: :feature do
   before do
     allow(User).to receive(:find_by_user_key).and_return(stub_model(User, twitter_handle: 'bob'))
   end
@@ -25,14 +24,14 @@ describe "Browse files", :type => :feature do
   end
 
   describe "when not logged in" do
-    it "should let us browse some of the fixtures" do
+    it "lets us browse some of the fixtures" do
       click_link "13"
       expect(page).to have_content "Search Results"
       click_link @fixtures[0].title[0]
       expect(page).to have_content "Download"
       expect(page).not_to have_content "Edit"
     end
-    it "should allow you to click next" do
+    it "allows you to click next" do
       within('.bottom') do
         click_link 'Next »'
       end

data/spec/features/catalog_search_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
-describe 'catalog searching', :type => :feature do
-
+describe 'catalog searching', type: :feature do
   before do
     @gf1 = GenericFile.new.tap do |f|
       f.title = ['title 1']
@@ -36,7 +35,7 @@ describe 'catalog searching', :type => :feature do
       end
     end
 
-    # TODO most of these tests could be controller tests.
+    # TODO: most of these tests could be controller tests.
     it "finds multiple files" do
       within('#masthead_controls') do
         fill_in('search-field-header', with: "tag2")
@@ -74,7 +73,7 @@ describe 'catalog searching', :type => :feature do
   context "many tags" do
     before do
       (1..25).each do |i|
-        @gf1.tag += ["tag#{sprintf('%02d', i)}"]
+        @gf1.tag += ["tag#{format('%02d', i)}"]
       end
       @gf1.save!
       within('#masthead_controls') do
@@ -92,6 +91,5 @@ describe 'catalog searching', :type => :feature do
       expect(page).to have_content "Download"
       expect(page).to_not have_content "Edit"
     end
-
   end
 end

data/spec/features/cloud_upload_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe "Selecting files to import from cloud providers", :type => :feature do
+describe "Selecting files to import from cloud providers", type: :feature do
   before do
     sign_in :user
     click_link "Upload"
   end
 
-  it "should have a Cloud file picker using browse-everything" do
+  it "has a Cloud file picker using browse-everything" do
     click_link "Cloud Providers"
     expect(page).to have_content "Browse cloud files"
     expect(page).to have_content "Submit selected files"

data/spec/features/collection_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'collection', :type => :feature do
+describe 'collection', type: :feature do
   def create_collection(title, description)
     visit '/dashboard'
     first('#hydra-collection-add').click
@@ -20,10 +20,10 @@ describe 'collection', :type => :feature do
     expect(page).to have_content description
   end
 
-  let(:title1) {"Test Collection 1"}
-  let(:description1) {"Description for collection 1 we are testing."}
-  let(:title2) {"Test Collection 2"}
-  let(:description2) {"Description for collection 2 we are testing."}
+  let(:title1) { "Test Collection 1" }
+  let(:description1) { "Description for collection 1 we are testing." }
+  let(:title2) { "Test Collection 2" }
+  let(:description2) { "Description for collection 2 we are testing." }
 
   let(:user) { FactoryGirl.create(:user) }
 
@@ -47,7 +47,7 @@ describe 'collection', :type => :feature do
       create_collection(title2, description2)
     end
 
-    it "should create collection from the dashboard and include files", js: true do
+    it "creates collection from the dashboard and include files", js: true do
       visit '/dashboard/files'
       first('input#check_all').click
       click_button "Add to Collection" # opens the modal
@@ -63,7 +63,7 @@ describe 'collection', :type => :feature do
 
   describe 'delete collection' do
     let!(:collection) do
-      Collection.create( title: 'collection title', description: 'collection description') do |c|
+      Collection.create(title: 'collection title', description: 'collection description') do |c|
         c.apply_depositor_metadata(user.user_key)
       end
     end
@@ -72,9 +72,9 @@ describe 'collection', :type => :feature do
       visit '/dashboard/collections'
     end
 
-    it "should delete a collection" do
+    it "deletes a collection" do
       expect(page).to have_content(collection.title)
-      within('#document_'+collection.id) do
+      within('#document_' + collection.id) do
         first('button.dropdown-toggle').click
         first(".itemtrash").click
       end
@@ -84,7 +84,7 @@ describe 'collection', :type => :feature do
 
   describe 'show collection' do
     let!(:collection) do
-      Collection.create( title: 'collection title', description: 'collection description',
+      Collection.create(title: 'collection title', description: 'collection description',
                         members: [gf1, gf2]) do |c|
         c.apply_depositor_metadata(user.user_key)
       end
@@ -94,9 +94,9 @@ describe 'collection', :type => :feature do
       visit '/dashboard/collections'
     end
 
-    it "should show a collection with a listing of Descriptive Metadata and catalog-style search results" do
+    it "shows a collection with a listing of Descriptive Metadata and catalog-style search results" do
       expect(page).to have_content(collection.title)
-      within('#document_'+collection.id) do
+      within('#document_' + collection.id) do
         click_link("Display all details of collection title")
       end
       expect(page).to have_content(collection.title)
@@ -116,7 +116,7 @@ describe 'collection', :type => :feature do
       expect(page).to have_content(gf2.title.first)
     end
 
-    it "should hide collection descriptive metadata when searching a collection" do
+    it "hides collection descriptive metadata when searching a collection" do
       # URL: /dashboard/collections
       expect(page).to have_content(collection.title)
       within("#document_#{collection.id}") do
@@ -143,7 +143,7 @@ describe 'collection', :type => :feature do
   describe 'edit collection' do
     let!(:collection) do
       Collection.create(title: 'collection title', description: 'collection description',
-                     members: [gf1, gf2]) { |c| c.apply_depositor_metadata(user.user_key) }
+                        members: [gf1, gf2]) { |c| c.apply_depositor_metadata(user.user_key) }
     end
 
     before do
@@ -151,7 +151,7 @@ describe 'collection', :type => :feature do
       visit '/dashboard/collections'
     end
 
-    it "should edit and update collection metadata" do
+    it "edits and update collection metadata" do
       # URL: /dashboard/collections
       expect(page).to have_content(collection.title)
       within("#document_#{collection.id}") do
@@ -179,7 +179,7 @@ describe 'collection', :type => :feature do
       expect(page).to have_content(creators.first)
     end
 
-    it "should remove a file from a collection" do
+    it "removes a file from a collection" do
       expect(page).to have_content(collection.title)
       within("#document_#{collection.id}") do
         first('button.dropdown-toggle').click
@@ -199,9 +199,9 @@ describe 'collection', :type => :feature do
       expect(page).to have_content(gf2.title.first)
     end
 
-    it "should remove all files from a collection", js: true do
+    it "removes all files from a collection", js: true do
       expect(page).to have_content(collection.title)
-      within('#document_'+collection.id) do
+      within('#document_' + collection.id) do
         first('button.dropdown-toggle').click
         click_link('Edit Collection')
       end
@@ -231,13 +231,13 @@ describe 'collection', :type => :feature do
 
     let!(:collection) do
       Collection.create(title: 'collection title', description: 'collection description',
-                     members: gfs) { |c| c.apply_depositor_metadata(user.user_key) }
+                        members: gfs) { |c| c.apply_depositor_metadata(user.user_key) }
     end
 
-    it "should show a collection with a listing of Descriptive Metadata and catalog-style search results" do
+    it "shows a collection with a listing of Descriptive Metadata and catalog-style search results" do
       visit '/dashboard/collections'
       expect(page).to have_content(collection.title)
-      within('#document_'+collection.id) do
+      within('#document_' + collection.id) do
         click_link("Display all details of collection title")
       end
       expect(page).to have_css(".pager")

data/spec/features/contact_form_spec.rb

@@ -1,12 +1,11 @@
 require 'spec_helper'
 
-describe "Sending an email via the contact form", :type => :feature do
-
+describe "Sending an email via the contact form", type: :feature do
   before do
     sign_in :user_with_fixtures
   end
 
-  it "should send mail" do
+  it "sends mail" do
     allow_any_instance_of(ContactForm).to receive(:deliver).and_return(true)
     visit '/'
     click_link "Contact"
@@ -22,7 +21,7 @@ describe "Sending an email via the contact form", :type => :feature do
     allow_any_instance_of(ContactForm).to receive(:deliver).and_call_original
   end
 
-  it "should give an error when I don't provide a contact type" do
+  it "gives an error when I don't provide a contact type" do
     visit '/'
     click_link "Contact"
     expect(page).to have_content "Contact Form"
@@ -34,7 +33,7 @@ describe "Sending an email via the contact form", :type => :feature do
     expect(page).to have_content "Sorry, this message was not sent successfully"
   end
 
-  it "should give an error when I don't provide a valid email" do
+  it "gives an error when I don't provide a valid email" do
     visit '/'
     click_link "Contact"
     expect(page).to have_content "Contact Form"
@@ -47,7 +46,7 @@ describe "Sending an email via the contact form", :type => :feature do
     expect(page).to have_content "Sorry, this message was not sent successfully"
   end
 
-  it "should give an error when I don't provide a name" do
+  it "gives an error when I don't provide a name" do
     visit '/'
     click_link "Contact"
     expect(page).to have_content "Contact Form"
@@ -60,8 +59,8 @@ describe "Sending an email via the contact form", :type => :feature do
   end
 
   context "when I don't provide a subject", :js do
-    it "should give an error" do
-      # TODO this should be a controller test, because that any_instance will be in a different thread
+    it "gives an error" do
+      # TODO: this should be a controller test, because that any_instance will be in a different thread
       visit '/'
       click_link "Contact"
       expect(page).to have_content "Contact Form"
@@ -75,8 +74,8 @@ describe "Sending an email via the contact form", :type => :feature do
   end
 
   context "when I don't provide a message", :js do
-    it "should give an error" do
-      # TODO this should be a controller test, because that any_instance will be in a different thread
+    it "gives an error" do
+      # TODO: this should be a controller test, because that any_instance will be in a different thread
       visit '/'
       click_link "Contact"
       expect(page).to have_content "Contact Form"
@@ -89,7 +88,7 @@ describe "Sending an email via the contact form", :type => :feature do
     end
   end
 
-  it "should give an error when I provide an invalid captcha" do
+  it "gives an error when I provide an invalid captcha" do
     visit '/'
     click_link "Contact"
     expect(page).to have_content "Contact Form"

data/spec/features/display_dashboard_spec.rb

@@ -1,38 +1,34 @@
 require 'spec_helper'
 
-describe "The Dashboard", :type => :feature do
-
+describe "The Dashboard", type: :feature do
   before do
     sign_in :user_with_fixtures
   end
 
   context "upon sign-in" do
-
-    it "should show the user's information" do
+    it "shows the user's information" do
       expect(page).to have_content "My Dashboard"
       expect(page).to have_content "User Activity"
       expect(page).to have_content "User Notifications"
       expect(page).to have_content "Your Statistics"
     end
 
-    it "should let the user upload files" do
+    it "lets the user upload files" do
       click_link "Upload"
       expect(page).to have_content "Upload"
     end
 
-    it "should let the user create collections" do
+    it "lets the user create collections" do
       click_link "Create Collection"
       expect(page).to have_content "Create New Collection"
     end
 
-    it "should let the user view files" do
+    it "lets the user view files" do
       click_link "View Files"
       expect(page).to have_content "My Files"
       expect(page).to have_content "My Collections"
       expect(page).to have_content "My Highlights"
       expect(page).to have_content "Files Shared with Me"
     end
-
   end
-
 end

data/spec/features/edit_file_spec.rb

@@ -1,19 +1,19 @@
 require 'spec_helper'
 
-describe "Editing a file:", :type => :feature do
+describe "Editing a file:", type: :feature do
   let(:user) { FactoryGirl.create(:user) }
   let(:file_title) { 'Some kind of title' }
-  let(:file) { GenericFile.new.tap do |f|
-                 f.title = [file_title]
-                 f.apply_depositor_metadata(user.user_key)
-                 f.save!
-               end
-  }
+  let(:file) do
+    GenericFile.new.tap do |f|
+      f.title = [file_title]
+      f.apply_depositor_metadata(user.user_key)
+      f.save!
+    end
+  end
 
   before { sign_in user }
 
   context 'when the user tries to update file content, but forgets to select a file:' do
-
     it 'displays an error' do
       visit sufia.edit_generic_file_path(file)
       click_link 'Versions'
@@ -21,6 +21,5 @@ describe "Editing a file:", :type => :feature do
       expect(page).to have_content "Edit #{file_title}"
       expect(page).to have_content 'Please select a file'
     end
-
   end
 end

data/spec/features/featured_item_spec.rb

@@ -8,7 +8,7 @@ describe "featuring items" do
       u.save
       u
     end
-    it "should have a working unfeature link", :js => true do
+    it "has a working unfeature link", js: true do
       sign_in user
       file = create(:public_file)
       create(:featured_work, generic_file_id: file.id)

data/spec/features/ingest_upload_files_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe "Uploading files via web form", :type => :feature do
+describe "Uploading files via web form", type: :feature do
   before do
     sign_in :user
     click_link "Upload"
   end
 
-  it "should have an ingest screen" do
+  it "has an ingest screen" do
     expect(page).to have_content "Select files"
     expect(page).to have_content "Start upload"
     expect(page).to have_content "Cancel upload"
@@ -14,9 +14,9 @@ describe "Uploading files via web form", :type => :feature do
   end
 
   context "the terms of service", :js do
-    it "should be required to be checked" do
-      attach_file("files[]", File.dirname(__FILE__)+"/../../spec/fixtures/image.jp2")
-      attach_file("files[]", File.dirname(__FILE__)+"/../../spec/fixtures/jp2_fits.xml")
+    it "is required to be checked" do
+      attach_file("files[]", File.dirname(__FILE__) + "/../../spec/fixtures/image.jp2")
+      attach_file("files[]", File.dirname(__FILE__) + "/../../spec/fixtures/jp2_fits.xml")
       expect(page).to have_css("button#main_upload_start[disabled]")
       find('#main_upload_start_span').hover
       expect(page).to have_content "Please accept Deposit Agreement before you can upload."

data/spec/features/notifications_spec.rb

@@ -1,13 +1,12 @@
 require 'spec_helper'
 
-describe "Notifications page", :type => :feature do
-
+describe "Notifications page", type: :feature do
   before do
     sign_in FactoryGirl.create(:user_with_mail)
     visit "/notifications"
   end
 
-  it "should list notifications with date, subject and message" do
+  it "lists notifications with date, subject and message" do
     expect(page).to have_content "User Notifications"
     expect(page.find(:xpath, '//thead/tr')).to have_content "Date"
     expect(page.find(:xpath, '//thead/tr')).to have_content "Subject"
@@ -19,7 +18,4 @@ describe "Notifications page", :type => :feature do
     expect(page).to have_content "Batch upload permission denied  "
     expect(page).to have_content "Batch upload complete"
   end
-
-
-
 end

data/spec/features/ownership_transfer_spec.rb

@@ -5,14 +5,14 @@ include Selectors::Dashboard
 include Selectors::NewTransfers
 include Selectors::Transfers
 
-describe 'Transferring file ownership:', :type => :feature do
+describe 'Transferring file ownership:', type: :feature do
   let(:original_owner) { FactoryGirl.create(:archivist, display_name: 'Original Owner') }
   let(:new_owner) { FactoryGirl.create(:jill, display_name: 'New Owner') }
   let!(:file) do
     GenericFile.new.tap do |f|
       f.title = ['little_file.txt']
       f.creator = ['little_file.txt_creator']
-      f.resource_type = ["stuff" ]
+      f.resource_type = ["stuff"]
       f.read_groups = ['public']
       f.apply_depositor_metadata(original_owner.user_key)
       f.save!

data/spec/features/proxy_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'proxy', :type => :feature do
+describe 'proxy', type: :feature do
   let(:user) { FactoryGirl.find_or_create(:archivist) }
   let(:second_user) { FactoryGirl.find_or_create(:jill) }
 
@@ -33,7 +33,7 @@ describe 'proxy', :type => :feature do
       end
       select(second_user.user_key, from: 'on_behalf_of')
       test_file_path = File.expand_path('../../fixtures/small_file.txt', __FILE__)
-      page.execute_script(%Q{$("input[type=file]").first().css("opacity", "1").css("-moz-transform", "none");$("input[type=file]").first().attr('id',"fileselect");})
+      page.execute_script(%{$("input[type=file]").first().css("opacity", "1").css("-moz-transform", "none");$("input[type=file]").first().attr('id',"fileselect");})
       attach_file("fileselect", test_file_path)
       click_button('Start upload')
       expect(page).to have_content('Apply Metadata')