sufia 4.0.0.rc1 → 4.0.0.rc2

data/spec/features/catalog_search_spec.rb

@@ -2,22 +2,22 @@ require 'spec_helper'
 
 describe 'catalog searching' do
 
-  before :all do
-    @gf1 =  GenericFile.new.tap do |f|
-      f.title = 'title 1'
+  before(:all) do
+    @gf1 = GenericFile.new.tap do |f|
+      f.title = ['title 1']
       f.tag = ["tag1", "tag2"]
       f.apply_depositor_metadata('jilluser')
       f.read_groups = ['public']
       f.save!
     end
-    @gf2 =  GenericFile.new.tap do |f|
-      f.title = 'title 2'
+    @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|
+    @col = Collection.new.tap do |f|
       f.title = 'title 3'
       f.tag = ["tag3", "tag4"]
       f.apply_depositor_metadata('jilluser')
@@ -33,6 +33,7 @@ describe 'catalog searching' do
   end
 
   before do
+    allow(User).to receive(:find_by_user_key).and_return(stub_model(User, twitter_handle: 'bob'))
     sign_in :user
     visit '/'
   end

data/spec/features/collection_spec.rb

@@ -6,7 +6,7 @@ describe 'collection' do
     first('#hydra-collection-add').click
     expect(page).to have_content 'Create New Collection'
     fill_in('Title', with: title)
-    fill_in('Description', with: description)
+    fill_in('Abstract or Summary', with: description)
     click_button("Create Collection")
     expect(page).to have_content 'Items in this Collection'
     expect(page).to have_content title
@@ -28,7 +28,7 @@ describe 'collection' do
     @gfs = []
     (0..12).each do |x|
       @gfs[x] =  GenericFile.new.tap do |f|
-        f.title = "title #{x}"
+        f.title = ["title #{x}"]
         f.apply_depositor_metadata('archivist1@example.com')
         f.save!
       end
@@ -57,7 +57,9 @@ describe 'collection' do
       # since there is only one collection, it's not necessary to choose a radio button
       click_button "Update Collection"
       expect(page).to have_content "Items in this Collection"
-      expect(page).to have_selector "ol.catalog li:nth-child(9)" # at least 9 files 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)"
     end
   end
 
@@ -93,18 +95,21 @@ 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("collection title")
       end
-      page.should have_content(@collection.title)
-      page.should have_content(@collection.description)
+      expect(page).to have_content(@collection.title)
+      expect(page).to have_content(@collection.description)
+      # Should not show title and description a second time
+      expect(page).to_not have_css('.metadata-collections', text: @collection.title)
+      expect(page).to_not have_css('.metadata-collections', text: @collection.description)
       # Should not have Collection Descriptive metadata table
-      page.should have_content("Descriptions")
+      expect(page).to have_content("Descriptions")
       # Should have search results / contents listing
-      page.should have_content(@gf1.title.first)
-      page.should have_content(@gf2.title.first)
-      page.should_not have_css(".pager")
+      expect(page).to have_content(@gf1.title.first)
+      expect(page).to have_content(@gf2.title.first)
+      expect(page).to_not have_css(".pager")
 
       click_link "Gallery"
       expect(page).to have_content(@gf1.title.first)
@@ -112,25 +117,26 @@ describe 'collection' do
     end
 
     it "should hide collection descriptive metadata when searching a collection" do
-      page.should have_content(@collection.title)
+      # URL: /dashboard/collections
+      expect(page).to have_content(@collection.title)
       within("#document_#{@collection.noid}") do
         click_link("collection title")
       end
-      page.should have_content(@collection.title)
-      page.should have_content(@collection.description)
-      page.should have_content(@gf1.title.first)
-      page.should have_content(@gf2.title.first)
+      # URL: /collections/collection-id
+      expect(page).to have_content(@collection.title)
+      expect(page).to have_content(@collection.description)
+      expect(page).to have_content(@gf1.title.first)
+      expect(page).to have_content(@gf2.title.first)
       fill_in('collection_search', with: @gf1.title.first)
       click_button('collection_submit')
-      # Should not have Collection Descriptive metadata table
-      page.should_not have_content("Descriptions")
-      page.should have_content(@collection.title)
-      page.should have_content(@collection.description)
+      # Should not have Collection metadata table (only title and description)
+      expect(page).to_not have_content("Total Items")
+      expect(page).to have_content(@collection.title)
+      expect(page).to have_content(@collection.description)
       # Should have search results / contents listing
-      page.should have_content(@gf1.title.first)
-      page.should_not have_content(@gf2.title.first)
-      # Should not have Dashboard content in contents listing
-      page.should_not have_content("Visibility")
+      expect(page).to have_content("Search Results")
+      expect(page).to have_content(@gf1.title.first)
+      expect(page).to_not have_content(@gf2.title.first)
     end
   end
 
@@ -146,27 +152,31 @@ describe 'collection' do
     end
 
     it "should edit and update collection metadata" do
-      page.should have_content(@collection.title)
+      # URL: /dashboard/collections
+      expect(page).to have_content(@collection.title)
       within("#document_#{@collection.noid}") do
         find('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)
+      # URL: /collections/collection-id/edit
+      expect(page).to have_field('collection_title', with: @collection.title)
+      expect(page).to have_field('collection_description', with: @collection.description)
       new_title = "Altered Title"
       new_description = "Completely new Description text."
       creators = ["Dorje Trollo", "Vajrayogini"]
       fill_in('Title', with: new_title)
-      fill_in('Description', with: new_description)
+      fill_in('Abstract or Summary', with: new_description)
       fill_in('Creator', with: creators.first)
-      within('.form-actions') do
+      within('.primary-actions') do
         click_button('Update Collection')
       end
-      page.should_not have_content(@collection.title)
-      page.should_not have_content(@collection.description)
-      page.should have_content(new_title)
-      page.should have_content(new_description)
-      page.should have_content(creators.first)
+      # URL: /collections/collection-id
+      header = find('header')
+      expect(header).to_not have_content(@collection.title)
+      expect(header).to_not have_content(@collection.description)
+      expect(header).to have_content(new_title)
+      expect(header).to have_content(new_description)
+      expect(page).to have_content(creators.first)
     end
 
     it "should remove a file from a collection" do

data/spec/features/display_dashboard_spec.rb

@@ -1,35 +1,38 @@
 require 'spec_helper'
 
-describe "Display User Dashboard" do
+describe "The Dashboard" do
 
   before do
     sign_in :user_with_fixtures
-    visit "/dashboard"
   end
 
-  it "should show the user's information" do
-    page.should have_content "My Dashboard"
-    page.should have_content "User Activity"
-    page.should have_content "User Notifications"
-    page.should have_content "Your Statistics"
-  end
+  context "upon sign-in" do
 
-  it "should let the user upload files" do
-    click_link "Upload"
-    page.should have_content "Upload"
-  end
+    it "should show the user's information" do
+      page.should have_content "My Dashboard"
+      page.should have_content "User Activity"
+      page.should have_content "User Notifications"
+      page.should have_content "Your Statistics"
+    end
 
-  it "should let the user create collections" do
-    click_link "Create Collection"
-    page.should have_content "Create New Collection"
-  end
+    it "should let the user upload files" do
+      click_link "Upload"
+      page.should have_content "Upload"
+    end
+
+    it "should let the user create collections" do
+      click_link "Create Collection"
+      page.should have_content "Create New Collection"
+    end
+
+    it "should let the user view files" do
+      click_link "View Files"
+      page.should have_content "My Files"
+      page.should have_content "My Collections"
+      page.should have_content "My Highlights"
+      page.should have_content "Files Shared with Me"
+    end
 
-  it "should let the user view files" do
-    click_link "View Files"
-    page.should have_content "Files"
-    page.should have_content "Collections"
-    page.should have_content "Highlighted"
-    page.should have_content "Shared with Me"
   end
 
 end

data/spec/features/notifications_spec.rb

@@ -4,17 +4,22 @@ describe "Notifications page" do
 
   before do
     sign_in FactoryGirl.create(:user_with_mail)
+    visit "/notifications"
   end
 
   it "should list notifications with date, subject and message" do
-    visit "/notifications"
     page.should have_content "User Notifications"
     page.find(:xpath, '//thead/tr').should have_content "Date"
     page.find(:xpath, '//thead/tr').should have_content "Subject"
     page.find(:xpath, '//thead/tr').should have_content "Message"
-    page.should have_content "Sample notification."
-    page.should have_content "less than a minute ago"
-    page.should have_content "You've got mail."
+    page.should have_content "These files could not be updated. You do not have sufficient privileges to edit them. "
+    page.should have_content "These files have been saved"
+    page.should have_content "File 1 could not be updated. You do not have sufficient privileges to edit it."
+    page.should have_content "File 1 has been saved"
+    page.should have_content "Batch upload permission denied  "
+    page.should have_content "Batch upload complete"
   end
 
+
+
 end

data/spec/features/users_spec.rb

@@ -1,41 +1,50 @@
 require 'spec_helper'
 
+
 describe "User Profile" do
 
   before do
     sign_in FactoryGirl.create(:curator)
   end
 
-  it "should be displayed" do
-    click_link "curator1@example.com"
-    page.should have_content "Edit Your Profile"
+  context 'when visiting user profile' do
+    it 'should render 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')
+    end
   end
 
-  it "should be editable" do
-    click_link "curator1@example.com"
-    click_link "Edit Your Profile"
-    page.should have_xpath("//form[@action='/users/curator1@example-dot-com']")
-    fill_in 'user_twitter_handle', with: 'curatorOfData'
-    click_button 'Save Profile'
-    page.should have_content "Your profile has been updated"
-    page.should have_content "curatorOfData"
+  context 'when clicking all users' do
+    it 'should display 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']")
+    end
   end
 
-  it "should display all users" do
-    click_link "curator1@example.com"
-    click_link "View Users"
-    page.should have_xpath("//td/a[@href='/users/curator1@example-dot-com']")
+  context 'when visiting user profile' do
+    it 'page should be editable' do
+      visit '/users/curator1@example-dot-com'
+      click_link 'Edit Your Profile'
+      fill_in 'user_twitter_handle', with: 'curatorOfData'
+      click_button 'Save Profile'
+      expect(page).to have_content 'Your profile has been updated'
+      expect(page).to have_content 'curatorOfData'
+    end
   end
 
-  it "should be searchable" do
-    @archivist = FactoryGirl.find_or_create(:archivist)
-    click_link "curator1@example.com"
-    click_link "View Users"
-    page.should have_xpath("//td/a[@href='/users/curator1@example-dot-com']")
-    page.should have_xpath("//td/a[@href='/users/archivist1@example-dot-com']")
-    fill_in 'user_search', with: 'archivist1@example.com'
-    click_button "user_submit"
-    page.should_not have_xpath("//td/a[@href='/users/curator1@example-dot-com']")
-    page.should have_xpath("//td/a[@href='/users/archivist1@example-dot-com']")
+  context 'user profile' do
+    it 'should be searchable' do
+      @archivist = FactoryGirl.find_or_create(:archivist)
+      visit '/users/curator1@example-dot-com'
+      click_link 'View Users'
+      expect(page).to have_xpath("//td/a[@href='/users/curator1@example-dot-com']")
+      expect(page).to have_xpath("//td/a[@href='/users/archivist1@example-dot-com']")
+      fill_in 'user_search', with: 'archivist1@example.com'
+      click_button "user_submit"
+      expect(page).to_not have_xpath("//td/a[@href='/users/curator1@example-dot-com']")
+      expect(page).to have_xpath("//td/a[@href='/users/archivist1@example-dot-com']")
+    end
   end
 end

data/spec/helpers/batch_edits_helper_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe BatchEditsHelper do
+
+  describe "#render_check_all" do
+
+    before do
+      @document_list = ["doc1", "doc2"]
+      @batch_size_on_other_page = 1
+      @max_batch_size = 10
+    end
+
+    context "with my files" do
+      it "should show 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
+    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" })
+        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" })
+        assign(:disable_select_all, true)
+        expect(helper.render_check_all).to be_nil
+      end
+    end
+
+  end
+
+end

data/spec/helpers/dashboard_helper_spec.rb

@@ -23,18 +23,29 @@ describe DashboardHelper do
   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" })
-      expect(helper.on_the_dashboard?).to be_false
+      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" })
-      expect(helper.on_the_dashboard?).to be_true
+      expect(helper).to be_on_the_dashboard
       allow(helper).to receive(:params).and_return({ controller: "my/collections" })
-      expect(helper.on_the_dashboard?).to be_true
+      expect(helper).to be_on_the_dashboard
       allow(helper).to receive(:params).and_return({ controller: "my/highlights" })
-      expect(helper.on_the_dashboard?).to be_true
+      expect(helper).to be_on_the_dashboard
       allow(helper).to receive(:params).and_return({ controller: "my/shares" })
-      expect(helper.on_the_dashboard?).to be_true
+      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" })
+      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" })
+      expect(helper).to be_on_my_files
     end
   end
 

data/spec/helpers/generic_file_helper_spec.rb

@@ -0,0 +1,41 @@
+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] })
+      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(", "))
+      end
+
+    end
+
+    context "using a file that is not part of a collection" do
+      
+      let(:gf) do 
+        mock_model(GenericFile, { collections: [] })
+      end
+
+      it "should render nothing" do
+        expect(helper.render_collection_list(gf)).to be_nil
+      end
+
+    end
+
+  end
+
+end