sufia 4.0.1 → 4.1.0

data/spec/controllers/users_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe UsersController do
+describe UsersController, :type => :controller do
   before(:each) do
     @user = FactoryGirl.find_or_create(:jill)
     @another_user = FactoryGirl.find_or_create(:archivist)

data/spec/factories/generic_files.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :generic_file do
-    ignore do
+    transient do
       depositor "archivist1@example.com"
     end
     before(:create) do |gf, evaluator|
@@ -13,7 +13,7 @@ FactoryGirl.define do
 
     factory :fixture do
       factory :public_pdf do
-        ignore do
+        transient do
           pid "sufia:fixture-pdf"
         end
         initialize_with { new(pid: pid) }
@@ -27,7 +27,7 @@ FactoryGirl.define do
         end
       end
       factory :public_mp3 do
-        ignore do
+        transient do
           pid "sufia:fixture-mp3"
         end
         initialize_with { new(pid: pid) }
@@ -40,7 +40,7 @@ FactoryGirl.define do
         read_groups ["public"]
       end
       factory :public_wav do
-        ignore do
+        transient do
           pid "sufia:fixture-wav"
         end
         initialize_with { new(pid: pid) }

data/spec/factories/proxy_deposit_requests.rb

@@ -0,0 +1,6 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :proxy_deposit_request do
+  end
+end

data/spec/features/browse_dashboard_files_spec.rb

@@ -1,9 +1,16 @@
 require 'spec_helper'
 
-describe "Browse Dashboard" do
+describe "Browse Dashboard", :type => :feature do
 
-  before do
+  before :all do
+    cleanup_jetty
     @fixtures = find_or_create_file_fixtures
+  end
+  after :all do
+    cleanup_jetty
+  end
+
+  before do
     sign_in FactoryGirl.create :user_with_fixtures
   end
 
@@ -17,10 +24,13 @@ describe "Browse Dashboard" do
   context "within my files page" do
 
     before do
-      visit "dashboard/files"
+      visit "/dashboard/files"
     end
 
     it "should display all the necessary information" do
+      within("#document_#{@fixtures.first.noid}") do
+        click_button("Select an action")
+      end
       expect(page).to have_content("Edit File")
       expect(page).to have_content("Download File")
       expect(page).to_not have_content("Is part of:")
@@ -44,6 +54,7 @@ describe "Browse Dashboard" do
     end
 
     it "should allow you to browse facets" do
+      click_link "Subject"
       click_link "more Subjects"
       click_link "consectetur"
       within("#document_#{@fixtures[1].noid}") do
@@ -62,50 +73,28 @@ describe "Browse Dashboard" do
 
     it "should refresh the page of files" do
       click_button "Refresh"
-      expect(page).to have_content("Edit File")
-      expect(page).to have_content("Download File")
+      within("#document_#{@fixtures.first.noid}") do
+        click_button("Select an action")
+        expect(page).to have_content("Edit File")
+        expect(page).to have_content("Download File")
+      end
     end
 
     it "should allow me to edit files in batches" do
-      pending "Need to enable javascript testing"
       first('input#check_all').click
       click_button('Edit Selected')
       expect(page).to have_content('3 files')
     end
 
-  end
-
-  context "within my collections page" do
-    before do
-      visit "dashboard/collections"
-    end
-    it "should search within my collections" do
-      within(".input-group-btn") do
-        expect(page).to have_content("My Collections")
-      end
-    end
-  end
-
-  context "within my highlights page" do
-    before do
-      visit "dashboard/highlights"
-    end
-    it "should search within my highlights" do
-      within(".input-group-btn") do
-        expect(page).to have_content("My Highlights")
+    it "should link to my other tabs" do
+      ["My Collections", "My Highlights", "Files Shared with Me"].each do |tab|
+        within("#my_nav") do
+          click_link(tab)
+        end
+        expect(page).to have_content(tab)
       end
     end
-  end
 
-  context "within my shares page" do
-    before do
-      visit "dashboard/shares"
-    end
-    it "should search within my shares" do
-      within(".input-group-btn") do
-        expect(page).to have_content("My Shares")
-      end
-    end
   end
 
 end

data/spec/features/browse_files_spec.rb

@@ -1,12 +1,9 @@
 require 'spec_helper'
 
-describe "Browse files" 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
-
-  before(:all) do
+  before :all do
+    cleanup_jetty
     @fixtures = find_or_create_file_fixtures
     @fixtures[0].tag = ["key"]
     (1..25).each do |i|
@@ -15,25 +12,33 @@ describe "Browse files" do
     @fixtures[0].save
   end
 
+  after :all do
+    cleanup_jetty
+  end
+
   before do
+    allow(User).to receive(:find_by_user_key).and_return(stub_model(User, twitter_handle: 'bob'))
     visit '/'
     fill_in "search-field-header", with: "key"
     click_button "search-submit-header"
-    click_link "more Keywords"
+    click_link "Keyword"
+    click_link "more Keywords»"
   end
 
   describe "when not logged in" do
     it "should let us browse some of the fixtures" do
       click_link "18"
-      page.should have_content "Search Results"
+      expect(page).to have_content "Search Results"
       click_link @fixtures[0].title[0]
-      page.should have_content "Download"
-      page.should_not have_content "Edit"
+      expect(page).to have_content "Download"
+      expect(page).not_to have_content "Edit"
     end
     it "should allow you to click next" do
-      first(:link, 'Next').click
-      page.should have_content "5"
-      page.should_not have_content "11"
+      click_link 'Next »'
+      within(".modal-body") do
+        expect(page).to have_content "5"
+        expect(page).not_to have_content "11"
+      end
     end
   end
 end

data/spec/features/catalog_search_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'catalog searching' do
+describe 'catalog searching', :type => :feature do
 
   before(:all) do
     @gf1 = GenericFile.new.tap do |f|
@@ -84,11 +84,8 @@ describe 'catalog searching' do
     end
 
     it "allows for browsing tags" do
-      expect(page).to have_content('Search Results')
-      within('#facets') do
-        first('a.more_facets_link').click
-        click_link "more Keywords»"
-      end
+      click_link "Keyword"
+      click_link "more Keywords»"
       click_link "tag18"
       expect(page).to have_content "Search Results"
       click_link @gf1.title[0]

data/spec/features/cloud_upload_spec.rb

@@ -1,18 +1,16 @@
 require 'spec_helper'
 
-describe "Selecting files to import from cloud providers" 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
-    click_link "upload"
     click_link "Cloud Providers"
-    page.should have_content "Browse cloud files"
-    page.should have_content "Submit selected files"
-    page.should have_content "0 items selected"
+    expect(page).to have_content "Browse cloud files"
+    expect(page).to have_content "Submit selected files"
+    expect(page).to have_content "0 items selected"
     click_button 'Browse cloud files'
   end
-
 end

data/spec/features/collection_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'collection' do
+describe 'collection', :type => :feature do
   def create_collection(title, description)
     visit '/dashboard'
     first('#hydra-collection-add').click
@@ -19,12 +19,8 @@ describe 'collection' do
   let(:description2) {"Description for collection 2 we are testing."}
 
   let(:user) { FactoryGirl.find_or_create(:archivist) }
-  let(:user_key) { user.user_key }
 
   before(:all) do
-    @old_resque_inline_value = Resque.inline
-    Resque.inline = true
-
     @gfs = []
     (0..12).each do |x|
       @gfs[x] =  GenericFile.new.tap do |f|
@@ -38,10 +34,7 @@ describe 'collection' do
   end
 
   after(:all) do
-    Resque.inline = @old_resque_inline_value
-    Batch.destroy_all
-    GenericFile.destroy_all
-    Collection.destroy_all
+    ActiveFedora::Base.destroy_all
   end
 
   describe 'create collection' do
@@ -67,19 +60,19 @@ describe 'collection' do
     before (:each) do
       @collection = Collection.new title:'collection title'
       @collection.description = 'collection description'
-      @collection.apply_depositor_metadata(user_key)
+      @collection.apply_depositor_metadata(user.user_key)
       @collection.save
       sign_in user
       visit '/dashboard/collections'
     end
 
     it "should delete a collection" do
-      page.should have_content(@collection.title)
+      expect(page).to have_content(@collection.title)
       within('#document_'+@collection.noid) do
         first('button.dropdown-toggle').click
         first(".itemtrash").click
       end
-      page.should_not have_content(@collection.title)
+      expect(page).not_to have_content(@collection.title)
     end
   end
 
@@ -87,7 +80,7 @@ describe 'collection' do
     before do
       @collection = Collection.new title: 'collection title'
       @collection.description = 'collection description'
-      @collection.apply_depositor_metadata(user_key)
+      @collection.apply_depositor_metadata(user.user_key)
       @collection.members = [@gf1,@gf2]
       @collection.save
       sign_in user
@@ -144,7 +137,7 @@ describe 'collection' do
     before (:each) do
       @collection = Collection.new(title: 'collection title')
       @collection.description = 'collection description'
-      @collection.apply_depositor_metadata(user_key)
+      @collection.apply_depositor_metadata(user.user_key)
       @collection.members = [@gf1, @gf2]
       @collection.save
       sign_in user
@@ -180,41 +173,41 @@ describe 'collection' do
     end
 
     it "should remove a file from a collection" do
-      page.should have_content(@collection.title)
+      expect(page).to have_content(@collection.title)
       within("#document_#{@collection.noid}") do
         first('button.dropdown-toggle').click
         click_link('Edit Collection')
       end
-      page.should have_field('collection_title', with: @collection.title)
-      page.should have_field('collection_description', with: @collection.description)
-      page.should have_content(@gf1.title.first)
-      page.should have_content(@gf2.title.first)
+      expect(page).to have_field('collection_title', with: @collection.title)
+      expect(page).to have_field('collection_description', with: @collection.description)
+      expect(page).to have_content(@gf1.title.first)
+      expect(page).to have_content(@gf2.title.first)
       within("#document_#{@gf1.noid}") do
         first('button.dropdown-toggle').click
         click_button('Remove from Collection')
       end
-      page.should have_content(@collection.title)
-      page.should have_content(@collection.description)
-      page.should_not have_content(@gf1.title.first)
-      page.should have_content(@gf2.title.first)
+      expect(page).to have_content(@collection.title)
+      expect(page).to have_content(@collection.description)
+      expect(page).not_to have_content(@gf1.title.first)
+      expect(page).to have_content(@gf2.title.first)
     end
 
     it "should remove all files from a collection", js: true do
-      page.should have_content(@collection.title)
+      expect(page).to have_content(@collection.title)
       within('#document_'+@collection.noid) do
         first('button.dropdown-toggle').click
         click_link('Edit Collection')
       end
-      page.should have_field('collection_title', with: @collection.title)
-      page.should have_field('collection_description', with: @collection.description)
-      page.should have_content(@gf1.title.first)
-      page.should have_content(@gf2.title.first)
+      expect(page).to have_field('collection_title', with: @collection.title)
+      expect(page).to have_field('collection_description', with: @collection.description)
+      expect(page).to have_content(@gf1.title.first)
+      expect(page).to have_content(@gf2.title.first)
       first('input#check_all').click
       click_button('Remove From Collection')
-      page.should have_content(@collection.title)
-      page.should have_content(@collection.description)
-      page.should_not have_content(@gf1.title.first)
-      page.should_not have_content(@gf2.title.first)
+      expect(page).to have_content(@collection.title)
+      expect(page).to have_content(@collection.description)
+      expect(page).not_to have_content(@gf1.title.first)
+      expect(page).not_to have_content(@gf2.title.first)
     end
   end
 
@@ -222,7 +215,7 @@ describe 'collection' do
     before (:each) do
       @collection = Collection.new title:'collection title'
       @collection.description = 'collection description'
-      @collection.apply_depositor_metadata(user_key)
+      @collection.apply_depositor_metadata(user.user_key)
       @collection.members = @gfs
       @collection.save!
       sign_in user
@@ -230,11 +223,11 @@ describe 'collection' do
     end
 
     it "should show a collection with a listing of Descriptive Metadata and catalog-style search results" do
-      page.should have_content(@collection.title)
+      expect(page).to have_content(@collection.title)
       within('#document_'+@collection.noid) do
         click_link("Display all details of collection title")
       end
-      page.should have_css(".pager")
+      expect(page).to have_css(".pager")
     end
   end
 end

data/spec/features/contact_form_spec.rb

@@ -1,99 +1,99 @@
 require 'spec_helper'
 
-describe "Sending an email via the contact form" 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
-    ContactForm.any_instance.stub(:deliver).and_return(true)
+    allow_any_instance_of(ContactForm).to receive(:deliver).and_return(true)
     visit '/'
     click_link "Contact"
-    page.should have_content "Contact Form"
-    fill_in "contact_form_name", with: "Test McPherson" 
+    expect(page).to have_content "Contact Form"
+    fill_in "contact_form_name", with: "Test McPherson"
     fill_in "contact_form_email", with: "archivist1@example.com"
     fill_in "contact_form_message", with: "I am contacting you regarding ScholarSphere."
     fill_in "contact_form_subject", with: "My Subject is Cool"
     select "Depositing content", from: "contact_form_category"
     click_button "Send"
-    page.should have_content "Thank you"
+    expect(page).to have_content "Thank you"
     # this step allows the delivery to go back to normal
-    ContactForm.any_instance.unstub(:deliver)
+    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
     visit '/'
     click_link "Contact"
-    page.should have_content "Contact Form"
-    fill_in "contact_form_name", with: "Test McPherson" 
+    expect(page).to have_content "Contact Form"
+    fill_in "contact_form_name", with: "Test McPherson"
     fill_in "contact_form_email", with: "archivist1@example.com"
     fill_in "contact_form_message", with: "I am contacting you regarding ScholarSphere."
     fill_in "contact_form_subject", with: "My Subject is Cool"
     click_button "Send"
-    page.should have_content "Sorry, this message was not sent successfully"
+    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
     visit '/'
     click_link "Contact"
-    page.should have_content "Contact Form"
-    fill_in "contact_form_name", with: "Test McPherson" 
+    expect(page).to have_content "Contact Form"
+    fill_in "contact_form_name", with: "Test McPherson"
     fill_in "contact_form_email", with: "archivist1"
     fill_in "contact_form_message", with: "I am contacting you regarding ScholarSphere."
     fill_in "contact_form_subject", with: "My Subject is Cool"
     select "Depositing content", from: "contact_form_category"
     click_button "Send"
-    page.should have_content "Sorry, this message was not sent successfully"
+    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
     visit '/'
     click_link "Contact"
-    page.should have_content "Contact Form"
+    expect(page).to have_content "Contact Form"
     fill_in "contact_form_email", with: "archivist1@example.com"
     fill_in "contact_form_message", with: "I am contacting you regarding ScholarSphere."
     fill_in "contact_form_subject", with: "My Subject is Cool"
     select "Depositing content", from: "contact_form_category"
     click_button "Send"
-    page.should have_content "Sorry, this message was not delivered"
+    expect(page).to have_content "Sorry, this message was not delivered"
   end
 
   it "should give an error when I don't provide a subject" do
     visit '/'
     click_link "Contact"
-    page.should have_content "Contact Form"
-    fill_in "contact_form_name", with: "Test McPherson" 
+    expect(page).to have_content "Contact Form"
+    fill_in "contact_form_name", with: "Test McPherson"
     fill_in "contact_form_email", with: "archivist1@example.com"
     fill_in "contact_form_message", with: "I am contacting you regarding ScholarSphere."
     select "Depositing content", from: "contact_form_category"
+    expect_any_instance_of(ContactForm).not_to receive(:deliver)
     click_button "Send"
-    page.should have_content "Sorry, this message was not sent successfully"
   end
 
   it "should give an error when I don't provide a message" do
     visit '/'
     click_link "Contact"
-    page.should have_content "Contact Form"
-    fill_in "contact_form_name", with: "Test McPherson" 
+    expect(page).to have_content "Contact Form"
+    fill_in "contact_form_name", with: "Test McPherson"
     fill_in "contact_form_email", with: "archivist1@example.com"
     fill_in "contact_form_subject", with: "My Subject is Cool"
     select "Depositing content", from: "contact_form_category"
+    expect_any_instance_of(ContactForm).not_to receive(:deliver)
     click_button "Send"
-    page.should have_content "Sorry, this message was not sent successfully"
   end
 
   it "should give an error when I provide an invalid captcha" do
     visit '/'
     click_link "Contact"
-    page.should have_content "Contact Form"
-    fill_in "contact_form_contact_method", with: "My name is" 
-    fill_in "contact_form_name", with: "Test McPherson" 
+    expect(page).to have_content "Contact Form"
+    fill_in 'contact_form_contact_method', with: 'My name is', visible: false
+    fill_in "contact_form_name", with: "Test McPherson"
     fill_in "contact_form_email", with: "archivist1@example.com"
     fill_in "contact_form_subject", with: "My Subject is Cool"
     fill_in "contact_form_message", with: "I am contacting you regarding ScholarSphere."
     select "Depositing content", from: "contact_form_category"
     click_button "Send"
-    page.should have_content "Sorry, this message was not sent successfully"
+    expect(page).to have_content "Sorry, this message was not sent successfully"
   end
 end