sufia 5.0.0 → 6.0.0.beta1

data/spec/factories/generic_files.rb

@@ -14,43 +14,35 @@ FactoryGirl.define do
     factory :fixture do
       factory :public_pdf do
         transient do
-          pid "sufia:fixture-pdf"
+          id "fixture-pdf"
         end
-        initialize_with { new(pid: pid) }
+        initialize_with { new(id: id) }
         read_groups ["public"]
         resource_type ["Dissertation"]
         subject %w"lorem ipsum dolor sit amet"
+        title ["fake_document.pdf"]
         before(:create) do |gf|
-          gf.apply_depositor_metadata "archivist1@example.com"
           gf.title = ["Fake Document Title"]
-          gf.label = "fake_document.pdf"
         end
       end
       factory :public_mp3 do
         transient do
-          pid "sufia:fixture-mp3"
+          id "fixture-mp3"
         end
-        initialize_with { new(pid: pid) }
+        initialize_with { new(id: id) }
         subject %w"consectetur adipisicing elit"
-        before(:create) do |gf|
-          gf.apply_depositor_metadata "archivist1@example.com"
-          gf.inner_object.pid = "sufia:fixture-mp3"
-          gf.label = "Test Document MP3.mp3"
-        end
+        title ["Test Document MP3.mp3"]
         read_groups ["public"]
       end
       factory :public_wav do
         transient do
-          pid "sufia:fixture-wav"
+          id "fixture-wav"
         end
-        initialize_with { new(pid: pid) }
+        initialize_with { new(id: id) }
         resource_type ["Audio", "Dataset"]
         read_groups ["public"]
+        title ["Fake Wav File.wav"]
         subject %w"sed do eiusmod tempor incididunt ut labore"
-        before(:create) do |gf|
-          gf.apply_depositor_metadata "archivist1@example.com"
-          gf.label = "Fake Wav File.wav"
-        end
       end
     end
   end

data/spec/features/browse_dashboard_files_spec.rb

@@ -2,19 +2,13 @@ require 'spec_helper'
 
 describe "Browse Dashboard", :type => :feature do
 
-  before :all do
-    cleanup_jetty
-    @fixtures = find_or_create_file_fixtures
-  end
-  after :all do
-    cleanup_jetty
-  end
-
+  let(:user) { FactoryGirl.create(:user) }
   before do
-    sign_in FactoryGirl.create :user_with_fixtures
+    @fixtures = create_file_fixtures(user.user_key)
+    sign_in user
   end
 
-  it "should search your files by deafult" do
+  it "should search your files by default" do
     visit "/dashboard"
     fill_in "q", with: "PDF"
     click_button "search-submit-header"
@@ -28,6 +22,7 @@ describe "Browse Dashboard", :type => :feature do
     end
 
     it "should display all the necessary information" do
+      # TODO this would make a good view test.
       within("#document_#{@fixtures.first.noid}") do
         click_button("Select an action")
       end
@@ -64,6 +59,7 @@ describe "Browse Dashboard", :type => :feature do
     end
 
     it "should allow me to edit files (from the fixtures)" do
+      # TODO this would make a good view test.
       fill_in "q", with: "Wav"
       click_button "search-submit-header"
       click_button "Select an action"
@@ -72,6 +68,7 @@ describe "Browse Dashboard", :type => :feature do
     end
 
     it "should refresh the page of files" do
+      # TODO this would make a good view test.
       click_button "Refresh"
       within("#document_#{@fixtures.first.noid}") do
         click_button("Select an action")
@@ -87,6 +84,7 @@ describe "Browse Dashboard", :type => :feature do
     end
 
     it "should link to my other tabs" do
+      # TODO this would make a good view test.
       ["My Collections", "My Highlights", "Files Shared with Me"].each do |tab|
         within("#my_nav") do
           click_link(tab)

data/spec/features/browse_files_spec.rb

@@ -2,23 +2,17 @@ require 'spec_helper'
 
 describe "Browse files", :type => :feature do
 
-  before :all do
-    cleanup_jetty
-    @fixtures = find_or_create_file_fixtures
+  before do
+    allow(User).to receive(:find_by_user_key).and_return(stub_model(User, twitter_handle: 'bob'))
+  end
+
+  before do
+    @fixtures = create_file_fixtures
     @fixtures[0].tag = ["key"]
     (1..25).each do |i|
-      @fixtures[0].tag << "key_#{i}"
+      @fixtures[0].tag << i.to_s
     end
-    @fixtures[1].tag = ["key"]
     @fixtures[0].save
-    (1..20).each do |i|
-      @fixtures[1].tag << "key_#{i}"
-    end
-    @fixtures[1].save
-  end
-
-  after :all do
-    cleanup_jetty
   end
 
   before do
@@ -28,30 +22,23 @@ describe "Browse files", :type => :feature do
     click_button "search-submit-header"
     click_link "Keyword"
     click_link "more Keywords»"
-    expect(page).to have_css "h3", text: "Keyword"
   end
 
   describe "when not logged in" do
     it "should let us browse some of the fixtures" do
-      click_link "18"
+      click_link "13"
       expect(page).to have_content "Search Results"
-      expect(page).to have_css "a", text: @fixtures[0].title[0]
       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
-      expect(page).to have_content "Numerical Sort"
-      expect(page).to have_css "a.sort_change", text:"A-Z Sort"
-      within(".modal-body") do
-        expect(page).to have_content "key_1 "
-        expect(page).not_to have_content "key_25 "
+      within('.bottom') do
+        click_link 'Next »'
       end
-      click_link 'Next »'
-      expect(page).to have_css "a.btn-link", text:"« Previous", wait: Capybara.default_wait_time*4
       within(".modal-body") do
-        expect(page).to have_content "key_25 "
-        expect(page).not_to have_content "key_1 "
+        expect(page).to have_content "5"
+        expect(page).not_to have_content "11"
       end
     end
   end

data/spec/features/catalog_search_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'catalog searching', :type => :feature do
 
-  before(:all) do
+  before do
     @gf1 = GenericFile.new.tap do |f|
       f.title = ['title 1']
       f.tag = ["tag1", "tag2"]
@@ -10,26 +10,6 @@ describe 'catalog searching', :type => :feature do
       f.read_groups = ['public']
       f.save!
     end
-    @gf2 = GenericFile.new.tap do |f|
-      f.title = ['title 2']
-      f.tag = ["tag2", "tag3"]
-      f.apply_depositor_metadata('jilluser')
-      f.read_groups = ['public']
-      f.save!
-    end
-    @col = Collection.new.tap do |f|
-      f.title = 'title 3'
-      f.tag = ["tag3", "tag4"]
-      f.apply_depositor_metadata('jilluser')
-      f.read_groups = ['public']
-      f.save!
-    end
-  end
-
-  after(:all) do
-    User.destroy_all
-    GenericFile.destroy_all
-    Collection.destroy_all
   end
 
   before do
@@ -38,45 +18,65 @@ describe 'catalog searching', :type => :feature do
     visit '/'
   end
 
-  it "finds multiple files" do
-    within('#masthead_controls') do
-      fill_in('search-field-header', with: "tag2")
-      click_button("Go")
+  context "with files and collections" do
+    before do
+      @gf2 = GenericFile.new.tap do |f|
+        f.title = ['title 2']
+        f.tag = ["tag2", "tag3"]
+        f.apply_depositor_metadata('jilluser')
+        f.read_groups = ['public']
+        f.save!
+      end
+      @col = Collection.new.tap do |f|
+        f.title = 'title 3'
+        f.tag = ["tag3", "tag4"]
+        f.apply_depositor_metadata('jilluser')
+        f.read_groups = ['public']
+        f.save!
+      end
     end
-    expect(page).to have_content('Search Results')
-    expect(page).to have_content(@gf1.title.first)
-    expect(page).to have_content(@gf2.title.first)
-    expect(page).to_not have_content(@col.title)
-  end
 
-  it "finds files and collections" do
-    within('#masthead_controls') do
-      fill_in('search-field-header', with: "tag3")
-      click_button("Go")
+    # 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")
+        click_button("Go")
+      end
+      expect(page).to have_content('Search Results')
+      expect(page).to have_content(@gf1.title.first)
+      expect(page).to have_content(@gf2.title.first)
+      expect(page).to_not have_content(@col.title)
     end
-    expect(page).to have_content('Search Results')
-    expect(page).to have_content(@col.title)
-    expect(page).to have_content(@gf2.title.first)
-    expect(page).to_not have_content(@gf1.title.first)
-  end
 
-  it "finds collections" do
-    within('#masthead_controls') do
-      fill_in('search-field-header', with: "tag4")
-      click_button("Go")
+    it "finds files and collections" do
+      within('#masthead_controls') do
+        fill_in('search-field-header', with: "tag3")
+        click_button("Go")
+      end
+      expect(page).to have_content('Search Results')
+      expect(page).to have_content(@col.title)
+      expect(page).to have_content(@gf2.title.first)
+      expect(page).to_not have_content(@gf1.title.first)
+    end
+
+    it "finds collections" do
+      within('#masthead_controls') do
+        fill_in('search-field-header', with: "tag4")
+        click_button("Go")
+      end
+      expect(page).to have_content('Search Results')
+      expect(page).to have_content(@col.title)
+      expect(page).to_not have_content(@gf2.title.first)
+      expect(page).to_not have_content(@gf1.title.first)
     end
-    expect(page).to have_content('Search Results')
-    expect(page).to have_content(@col.title)
-    expect(page).to_not have_content(@gf2.title.first)
-    expect(page).to_not have_content(@gf1.title.first)
   end
 
   context "many tags" do
     before do
       (1..25).each do |i|
-        @gf1.tag << "tag#{i.to_s}"
+        @gf1.tag += ["tag#{sprintf('%02d', i)}"]
       end
-      @gf1.save
+      @gf1.save!
       within('#masthead_controls') do
         fill_in('search-field-header', with: "tag1")
         click_button("Go")

data/spec/features/collection_spec.rb

@@ -5,13 +5,6 @@ describe 'collection', :type => :feature do
     visit '/dashboard'
     first('#hydra-collection-add').click
     expect(page).to have_content 'Create New Collection'
-
-    # Creator is a multi-value field, so it should have button to add more fields
-    expect(page).to have_selector "div.collection_creator .input-append button.add"
-
-    # Title is a single-value field, so it should not have the adder button
-    expect(page).to_not have_selector "div.collection_title .input-append button.add"
-
     fill_in('Title', with: title)
     fill_in('Abstract or Summary', with: description)
     click_button("Create Collection")
@@ -27,12 +20,11 @@ describe 'collection', :type => :feature do
 
   let(:user) { FactoryGirl.find_or_create(:archivist) }
 
-  before(:all) do
+  before do
     @gfs = []
-    (0..12).each do |x|
-      @gfs[x] =  GenericFile.new.tap do |f|
-        f.title = ["title #{x}"]
-        f.apply_depositor_metadata('archivist1@example.com')
+    (0..1).each do |x|
+      @gfs[x] =  GenericFile.new(title: ["title #{x}"]).tap do |f|
+        f.apply_depositor_metadata(user.user_key)
         f.save!
       end
     end
@@ -40,15 +32,11 @@ describe 'collection', :type => :feature do
     @gf2 = @gfs[1]
   end
 
-  after(:all) do
-    ActiveFedora::Base.destroy_all
-  end
-
   describe 'create collection' do
     before do
       sign_in user
-      visit '/dashboard/collections'
     end
+
     it "should create collection from the dashboard and include files", js: true do
       create_collection(title2, description2)
       visit '/dashboard/files'
@@ -58,13 +46,14 @@ describe 'collection', :type => :feature do
       click_button "Update Collection"
       expect(page).to have_content "Items in this Collection"
       # There are two rows in the table per document (one for the general info, one for the details)
-      # Make sure we have at least 9 documents (18 table rows)
-      expect(page).to have_selector "table.table-zebra-striped tr:nth-child(18)"
+      # Make sure we have at least 2 documents
+      expect(page).to have_selector "table.table-zebra-striped tr#document_#{@gf1.id}"
+      expect(page).to have_selector "table.table-zebra-striped tr#document_#{@gf2.id}"
     end
   end
 
   describe 'delete collection' do
-    before (:each) do
+    before do
       @collection = Collection.new title:'collection title'
       @collection.description = 'collection description'
       @collection.apply_depositor_metadata(user.user_key)
@@ -141,7 +130,7 @@ describe 'collection', :type => :feature do
   end
 
   describe 'edit collection' do
-    before (:each) do
+    before do
       @collection = Collection.new(title: 'collection title')
       @collection.description = 'collection description'
       @collection.apply_depositor_metadata(user.user_key)
@@ -219,9 +208,14 @@ describe 'collection', :type => :feature do
   end
 
   describe 'show pages of a collection' do
-    before (:each) do
-      @collection = Collection.new title:'collection title'
-      @collection.description = 'collection description'
+    before do
+      (2..12).each do |x|
+        @gfs[x] =  GenericFile.new(title: ["title #{x}"]).tap do |f|
+          f.apply_depositor_metadata(user.user_key)
+          f.save!
+        end
+      end
+      @collection = Collection.new title: 'collection title', description: 'collection description'
       @collection.apply_depositor_metadata(user.user_key)
       @collection.members = @gfs
       @collection.save!

data/spec/features/contact_form_spec.rb

@@ -59,28 +59,34 @@ describe "Sending an email via the contact form", :type => :feature do
     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"
-    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"
+  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
+      visit '/'
+      click_link "Contact"
+      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"
+    end
   end
 
-  it "should give an error when I don't provide a message" do
-    visit '/'
-    click_link "Contact"
-    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"
+  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
+      visit '/'
+      click_link "Contact"
+      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"
+    end
   end
 
   it "should give an error when I provide an invalid captcha" do