sufia 6.0.0.rc2 → 6.0.0.rc3

data/spec/test_app_templates/Gemfile.extra

@@ -0,0 +1 @@
+gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype'

data/spec/views/batch/edit.html.erb_spec.rb

@@ -12,29 +12,26 @@ describe 'batch/edit.html.erb' do
     render
   end
 
-  it "should draw tooltip for visibility" do
+  it "should draw the page" do
+    # form
+    expect(rendered).to have_selector "form#new_generic_file"
+    # should have browser validations
+    expect(rendered).not_to have_selector "form#new_generic_file[novalidate]"
+
+    # tooltip for visibility
     expect(rendered).to have_selector "span#visibility_tooltip a i.help-icon"
-  end
 
-  it "should draw tooltip for share_with" do
+    # tooltip for share_with
     expect(rendered).to have_selector "span#share_with_tooltip a i.help-icon"
-  end
 
-  context "rights" do
-    it "should have a modal" do
-      expect(rendered).to have_selector("div#rightsModal .modal-dialog .modal-content")
+    # access rights
+    expect(rendered).to have_selector("div#rightsModal .modal-dialog .modal-content")
+    expect(rendered).to have_selector('select#generic_file_rights[name="generic_file[rights][]"]')
+    page = Capybara::Node::Simple.new(rendered)
+    page.all('select#generic_file_rights option').each do |elem|
+      expect(elem.value).to_not be_empty
     end
 
-    it "should allow setting many rights" do
-      expect(rendered).to have_selector('select#generic_file_rights[name="generic_file[rights][]"]')
-    end
-
-    it "should not have an empty rights element" do
-      page = Capybara::Node::Simple.new(rendered)
-      page.all('select#generic_file_rights option').each do |elem|
-        expect(elem.value).to_not be_empty
-      end
-    end
   end
 end
 

data/spec/views/collections/_show_descriptions.html.erb_spec.rb

@@ -5,6 +5,7 @@ describe 'collections/_show_descriptions.html.erb', :type => :view do
     let(:collection) do
       mock_model(Collection,
                   resource_type: [], creator: [], contributor: [], tag: [],
+                  description: '', title: 'hmm',
                   rights: [], publisher: [], date_created: ['2000-01-01'], subject: [],
                   language: [], identifier: [], based_near: [], related_url: [],
                   members: ['foo', 'bar'], bytes: 123456678
@@ -12,7 +13,6 @@ describe 'collections/_show_descriptions.html.erb', :type => :view do
     end
     before do
       assign(:presenter, presenter)
-      assign(:collection, collection)
     end
 
     let(:presenter) { Sufia::CollectionPresenter.new(collection) }

data/spec/views/generic_file/_permission_form.html.erb_spec.rb

@@ -2,22 +2,44 @@ require 'spec_helper'
 
 describe 'generic_files/_permission_form.html.erb', :type => :view do
   let(:generic_file) {
-    stub_model(GenericFile, noid: '123',
+    stub_model(GenericFile, id: '123',
         depositor: 'bob',
         resource_type: ['Dataset'])
   }
 
+  let(:form) do
+    form_for(generic_file, url: '/update') do |gf_form|
+      return gf_form
+    end
+  end
+
   before do
     allow(controller).to receive(:current_user).and_return(stub_model(User))
-    allow(generic_file).to receive(:permissions).and_return([])
-    form_for(generic_file, url: '/update') do |f|
-      @f = f
+    allow(generic_file).to receive(:permissions).and_return(permissions)
+    allow(view).to receive(:f).and_return(form)
+    render
+  end
+
+  context "without additional users" do
+    let(:permissions) { [] }
+
+    it "should draw the permissions form without error" do
+      expect(rendered).to have_css("input#new_user_name_skel")
+      expect(rendered).not_to have_css("button.remove_perm")
     end
   end
 
-  it "should draw the permissions form without error" do
-    render 'generic_files/permission_form.html.erb', f: @f
-    expect(rendered).to have_css("input#new_user_name_skel")
+  context "with additional users" do
+    let(:depositor_permission) { Hydra::AccessControls::Permission.new(id: '123', name: 'bob', type: 'person', access: 'edit') }
+    let(:public_permission) { Hydra::AccessControls::Permission.new(id: '124', name: 'public', type: 'group', access: 'read') }
+    let(:other_permission) { Hydra::AccessControls::Permission.new(id: '125', name: 'joe@example.com', type: 'person', access: 'edit') }
+    let(:permissions) { [ depositor_permission, public_permission, other_permission] }
+
+    it "should draw the permissions form without error" do
+      expect(rendered).to have_css("input#new_user_name_skel")
+      expect(rendered).to have_css("button.remove_perm", count: 1) # depositor and public should be filtered out
+      expect(rendered).to have_css("button.remove_perm[data-index='2']")
+    end
   end
 
 end

data/spec/views/generic_file/edit.html.erb_spec.rb

@@ -14,7 +14,7 @@ describe 'generic_files/edit.html.erb', :no_clean do
     let(:content) { double('content', mimeType: 'application/pdf') }
 
     let(:generic_file) {
-      stub_model(GenericFile, id: '123', noid: '123',
+      stub_model(GenericFile, id: '123',
         depositor: 'bob',
         resource_type: ['Book', 'Dataset'])
     }

data/spec/views/generic_file/show.html.erb_spec.rb

@@ -12,7 +12,7 @@ describe 'generic_files/show.html.erb', :type => :view do
   end
 
   let(:generic_file) do
-    stub_model(GenericFile, id: '123', noid: '123',
+    stub_model(GenericFile, id: '123',
       depositor: depositor.user_key,
       audit_stat: 1,
       title: ['My Title'],
@@ -46,283 +46,202 @@ describe 'generic_files/show.html.erb', :type => :view do
   end
 
   describe 'schema.org' do
+    let(:item) { Mida::Document.new(rendered).items.first }
     describe 'descriptive metadata' do
       before do
         render template: 'generic_files/show.html.erb', layout: 'layouts/sufia-one-column'
-        @item = Mida::Document.new(rendered).items.first
       end
 
-      it 'sets itemtype to CreativeWork' do
-        expect(@item.type).to eq('http://schema.org/CreativeWork')
-      end
+      it 'draws schema.org fields' do
+        # set itemtype to CreativeWork
+        expect(item.type).to eq('http://schema.org/CreativeWork')
 
-      it 'sets title as name' do
-        expect(@item.properties['name'].first).to eq('My Title')
-      end
+        # set title as name
+        expect(item.properties['name'].first).to eq('My Title')
 
-      it 'sets description' do
-        expect(@item.properties['description'].first).to eq('Lorem ipsum lorem ipsum.')
-      end
+        expect(item.properties['description'].first).to eq('Lorem ipsum lorem ipsum.')
 
-      it 'sets tag as keywords' do
-        expect(@item.properties['keywords']).to include('bacon', 'sausage', 'eggs')
-      end
+        # tag as keywords
+        expect(item.properties['keywords']).to include('bacon', 'sausage', 'eggs')
 
-      it 'sets based_near as contentLocation' do
-        based_near = @item.properties['contentLocation'].first
+        # based_near as contentLocation
+        based_near = item.properties['contentLocation'].first
         expect(based_near.type).to eq('http://schema.org/Place')
         expect(based_near.properties['name'].first).to eq('Seattle, WA, US')
-      end
 
-      it 'sets contributor' do
-        contributors = @item.properties['contributor']
+        contributors = item.properties['contributor']
         expect(contributors.count).to eq(2)
         contributor = contributors.first
         expect(contributor.type).to eq('http://schema.org/Person')
         expect(contributor.properties['name'].first).to eq('Tweedledee')
-      end
 
-      it 'sets creator' do
-        creators = @item.properties['creator']
+        creators = item.properties['creator']
         expect(creators.count).to eq(2)
         creator = creators.first
         expect(creator.type).to eq('http://schema.org/Person')
         expect(creator.properties['name'].first).to eq('Doe, John')
-      end
 
-      it 'sets date_created as dateCreated' do
-        expect(@item.properties['dateCreated'].first).to eq('1984-01-02')
-      end
+        expect(item.properties['dateCreated'].first).to eq('1984-01-02')
 
-      it 'sets language as inLanguage' do
-        expect(@item.properties['inLanguage'].first).to eq('Quechua')
-      end
+        expect(item.properties['inLanguage'].first).to eq('Quechua')
 
-      it 'sets publisher' do
-        publisher = @item.properties['publisher'].first
+        publisher = item.properties['publisher'].first
         expect(publisher.type).to eq('http://schema.org/Organization')
         expect(publisher.properties['name'].first).to eq('Random Publishing, Inc.')
-      end
 
-      it 'sets subjects' do
-        subjects = @item.properties['about']
+        subjects = item.properties['about']
         expect(subjects.count).to eq(3)
         subject = subjects.first
         expect(subject.type).to eq('http://schema.org/Thing')
         expect(subject.properties['name'].first).to eq('Biology')
-      end
 
-      it 'sets depositor as accountablePerson' do
-        depositor = @item.properties['accountablePerson'].first
+        depositor = item.properties['accountablePerson'].first
         expect(depositor.type).to eq('http://schema.org/Person')
         expect(depositor.properties['name'].first).to eq('bob')
       end
     end
-
-    describe 'resource type-specific itemtypes' do
-      context 'when resource_type is Audio' do
-        it 'sets itemtype to AudioObject' do
-          generic_file.resource_type = ['Audio']
-          render template: 'generic_files/show.html.erb', layout: 'layouts/sufia-one-column'
-          @item = Mida::Document.new(rendered).items.first
-          expect(@item.type).to eq('http://schema.org/AudioObject')
-        end
-      end
-      context 'when resource_type is Conference Proceeding' do
-        it 'sets itemtype to ScholarlyArticle' do
-          generic_file.resource_type = ['Conference Proceeding']
-          render template: 'generic_files/show.html.erb', layout: 'layouts/sufia-one-column'
-          @item = Mida::Document.new(rendered).items.first
-          expect(@item.type).to eq('http://schema.org/ScholarlyArticle')
-        end
-      end
-    end
   end
 
   describe 'google scholar' do
-    # NOTE: before(:all) will not work in this context
-    before(:each) do
+    before do
       render template: 'generic_files/show.html.erb', layout: 'layouts/sufia-one-column'
     end
+    let(:doc) { Nokogiri::HTML(rendered) }
 
-    it 'appears in meta tags' do
-      gscholar_meta_tags = Nokogiri::HTML(rendered).xpath("//meta[contains(@name, 'citation_')]")
+    it 'displays meta tags' do
+      gscholar_meta_tags = doc.xpath("//meta[contains(@name, 'citation_')]")
       expect(gscholar_meta_tags.count).to eq(5)
-    end
 
-    it 'displays title' do
-      tag = Nokogiri::HTML(rendered).xpath("//meta[@name='citation_title']")
+      tag = doc.xpath("//meta[@name='citation_title']")
       expect(tag.attribute('content').value).to eq('My Title')
-    end
 
-    it 'displays authors' do
-      tags = Nokogiri::HTML(rendered).xpath("//meta[@name='citation_author']")
+      tags = doc.xpath("//meta[@name='citation_author']")
       expect(tags.first.attribute('content').value).to eq('Doe, John')
       expect(tags.last.attribute('content').value).to eq('Doe, Jane')
-    end
 
-    it 'displays publication date' do
-      tag = Nokogiri::HTML(rendered).xpath("//meta[@name='citation_publication_date']")
+      tag = doc.xpath("//meta[@name='citation_publication_date']")
       expect(tag.attribute('content').value).to eq('1984-01-02')
-    end
 
-    it 'displays download URL' do
-      tag = Nokogiri::HTML(rendered).xpath("//meta[@name='citation_pdf_url']")
+      tag = doc.xpath("//meta[@name='citation_pdf_url']")
       expect(tag.attribute('content').value).to eq('http://test.host/downloads/123')
     end
   end
 
   describe 'twitter cards' do
-    # NOTE: before(:all) will not work in this context
-    before(:each) do
+    before do
       render template: 'generic_files/show.html.erb', layout: 'layouts/sufia-one-column'
     end
+    let(:doc) { Nokogiri::HTML(rendered) }
 
     it 'appears in meta tags' do
-      twitter_meta_tags = Nokogiri::HTML(rendered).xpath("//meta[contains(@name, 'twitter:') or contains(@property, 'og:')]")
+      twitter_meta_tags = doc.xpath("//meta[contains(@name, 'twitter:') or contains(@property, 'og:')]")
       expect(twitter_meta_tags.count).to eq(13)
-    end
 
-    it 'displays twitter:card' do
-      tag = Nokogiri::HTML(rendered).xpath("//meta[@name='twitter:card']")
+      tag = doc.xpath("//meta[@name='twitter:card']")
       expect(tag.attribute('content').value).to eq('product')
-    end
 
-    it 'displays twitter:site' do
-      tag = Nokogiri::HTML(rendered).xpath("//meta[@name='twitter:site']")
+      tag = doc.xpath("//meta[@name='twitter:site']")
       expect(tag.attribute('content').value).to eq('@HydraSphere')
-    end
 
-    it 'displays twitter:creator' do
-      tag = Nokogiri::HTML(rendered).xpath("//meta[@name='twitter:creator']")
+      tag = doc.xpath("//meta[@name='twitter:creator']")
       expect(tag.attribute('content').value).to eq('@bot4lib')
-    end
 
-    it 'displays og:site_name' do
-      tag = Nokogiri::HTML(rendered).xpath("//meta[@property='og:site_name']")
+      tag = doc.xpath("//meta[@property='og:site_name']")
       expect(tag.attribute('content').value).to eq('Sufia')
-    end
 
-    it 'displays og:type' do
-      tag = Nokogiri::HTML(rendered).xpath("//meta[@property='og:type']")
+      tag = doc.xpath("//meta[@property='og:type']")
       expect(tag.attribute('content').value).to eq('object')
-    end
 
-    it 'displays og:title' do
-      tag = Nokogiri::HTML(rendered).xpath("//meta[@property='og:title']")
+      tag = doc.xpath("//meta[@property='og:title']")
       expect(tag.attribute('content').value).to eq('My Title')
-    end
 
-    it 'displays og:description' do
-      tag = Nokogiri::HTML(rendered).xpath("//meta[@property='og:description']")
+      tag = doc.xpath("//meta[@property='og:description']")
       expect(tag.attribute('content').value).to eq('Lorem ipsum lorem ipsum.')
-    end
 
-    it 'displays og:image' do
-      tag = Nokogiri::HTML(rendered).xpath("//meta[@property='og:image']")
-      expect(tag.attribute('content').value).to eq('http://test.host/downloads/123?datastream_id=thumbnail')
-    end
+      tag = doc.xpath("//meta[@property='og:image']")
+      expect(tag.attribute('content').value).to eq('http://test.host/downloads/123?file=thumbnail')
 
-    it 'displays og:url' do
-      tag = Nokogiri::HTML(rendered).xpath("//meta[@property='og:url']")
+      tag = doc.xpath("//meta[@property='og:url']")
       expect(tag.attribute('content').value).to eq('http://test.host/files/123')
-    end
 
-    it 'displays twitter:data1' do
-      tag = Nokogiri::HTML(rendered).xpath("//meta[@name='twitter:data1']")
+      tag = doc.xpath("//meta[@name='twitter:data1']")
       expect(tag.attribute('content').value).to eq('bacon, sausage, eggs')
-    end
 
-    it 'displays twitter:label1' do
-      tag = Nokogiri::HTML(rendered).xpath("//meta[@name='twitter:label1']")
+      tag = doc.xpath("//meta[@name='twitter:label1']")
       expect(tag.attribute('content').value).to eq('Keywords')
-    end
 
-    it 'displays twitter:data2' do
-      tag = Nokogiri::HTML(rendered).xpath("//meta[@name='twitter:data2']")
+      tag = doc.xpath("//meta[@name='twitter:data2']")
       expect(tag.attribute('content').value).to eq('http://example.org/rights/1')
-    end
 
-    it 'displays twitter:label2' do
-      tag = Nokogiri::HTML(rendered).xpath("//meta[@name='twitter:label2']")
+      tag = doc.xpath("//meta[@name='twitter:label2']")
       expect(tag.attribute('content').value).to eq('Rights')
     end
   end
 
   describe 'analytics' do
+    let(:page) { Capybara::Node::Simple.new(rendered) }
+    before do
+      Sufia.config.analytics = analytics
+      render
+    end
     context 'when enabled' do
-      before do
-        Sufia.config.analytics = true
-      end
+      let(:analytics) { true }
 
       it 'appears on page' do
-        render
-        page = Capybara::Node::Simple.new(rendered)
         expect(page).to have_selector('a#stats', count: 1)
       end
     end
 
     context 'when disabled' do
-      before do
-        Sufia.config.analytics = false
-      end
+      let(:analytics) { false }
 
       it 'does not appear on page' do
-        render
-        page = Capybara::Node::Simple.new(rendered)
         expect(page).to have_no_selector('a#stats')
       end
     end
   end
 
   describe 'featured' do
+    before do
+      allow(generic_file).to receive(:public?).and_return(public)
+      render
+    end
+    let(:page) { Capybara::Node::Simple.new(rendered) }
+
     context "public file" do
-      before do
-        allow(generic_file).to receive(:public?).and_return(true)
-      end
+      let(:public) { true }
 
       it "shows featured feature link for public file" do
-        render
-        page = Capybara::Node::Simple.new(rendered)
         expect(page).to have_selector('a[data-behavior="feature"]', count: 1)
       end
     end
 
     context "non public file" do
-      before do
-        allow(generic_file).to receive(:public?).and_return(false)
-      end
+      let(:public) { false }
 
       it "does not show feature link for non public file" do
-        render
-        page = Capybara::Node::Simple.new(rendered)
         expect(page).to have_no_selector('a[data-behavior="feature"]', count: 1)
       end
     end
   end
 
   describe 'collections list' do
-    context "when the file is not featured in any collections" do
+    before do
+      allow(generic_file).to receive(:collections).and_return(collections)
+      render
+    end
 
+    context "when the file is not featured in any collections" do
+      let(:collections) { [] }
       it "should display the empty message" do
-        render
         expect(rendered).to have_text(t('sufia.file.collections_list.empty'))
       end
     end
 
     context "when the file is featured in collections" do
-      let(:collection1) {
-        stub_model(Collection,
-          title: 'collection1',
-          noid: '456')
-      }
- 
-      before do
-        allow(generic_file).to receive(:collections).and_return([collection1])
-      end
+      let(:collections) { [stub_model(Collection, title: 'collection1', id: '456') ] }
 
       it "should display the header and titles of collections it belongs to" do
-        render
         expect(rendered).to have_text(t('sufia.file.collections_list.heading'))
         expect(rendered).to have_text('collection1')
       end
@@ -330,12 +249,11 @@ describe 'generic_files/show.html.erb', :type => :view do
   end
 
   describe 'visibility' do
-    let(:expected) do
-      '<span class="label label-danger" title="'+t('sufia.visibility.private')+'">'+t('sufia.visibility.private')+'</span></a>' 
+    before do
+      render
     end
     it "should display the visibility badge" do
-      render
-      expect(rendered).to include(expected)
+      expect(rendered).to include('<span class="label label-danger" title="'+t('sufia.visibility.private')+'">'+t('sufia.visibility.private')+'</span></a>')
     end
   end