blacklight-spotlight 0.15.0 → 0.16.0

data/spec/controllers/spotlight/catalog_controller_spec.rb

@@ -190,17 +190,6 @@ describe Spotlight::CatalogController, type: :controller do
       expect(controller.blacklight_config.view.admin_table.document_actions).to be_empty
     end
 
-    describe 'GET new' do
-      it 'is successful' do
-        expect(controller).to receive(:add_breadcrumb).with('Home', exhibit_path(exhibit, q: ''))
-        expect(controller).to receive(:add_breadcrumb).with('Curation', exhibit_dashboard_path(exhibit))
-        expect(controller).to receive(:add_breadcrumb).with('Items', admin_exhibit_catalog_index_path(exhibit))
-        expect(controller).to receive(:add_breadcrumb).with('Import items', new_exhibit_catalog_path(exhibit))
-        get :new, exhibit_id: exhibit
-        expect(response).to be_successful
-      end
-    end
-
     describe 'GET edit' do
       it 'is successful' do
         get :edit, exhibit_id: exhibit, id: 'dq287tq6352'

data/spec/controllers/spotlight/resources/csv_upload_controller_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe Spotlight::Resources::CsvUploadController, type: :controller do
+  routes { Spotlight::Engine.routes }
+  let(:exhibit) { FactoryGirl.create(:exhibit) }
+
+  describe 'when not logged in' do
+    describe 'POST create' do
+      it 'is not allowed' do
+        post :create, exhibit_id: exhibit
+        expect(response).to redirect_to main_app.new_user_session_path
+      end
+    end
+  end
+
+  describe 'when signed in as a curator' do
+    let(:user) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+    before { sign_in user }
+
+    describe 'POST create' do
+      let(:csv) { fixture_file_upload(File.expand_path(File.join('..', 'spec', 'fixtures', 'csv-upload-fixture.csv'), Rails.root), 'text/csv') }
+      let(:serialized_csv) do
+        [
+          {
+            'url' => 'http://lorempixel.com/800/500/',
+            'full_title_tesim' => 'A random image',
+            'spotlight_upload_description_tesim' => 'A random 800 by 500 image from lorempixel',
+            'spotlight_upload_attribution_tesim' => 'lorempixel.com',
+            'spotlight_upload_date_tesim' => '2015'
+          },
+          {
+            'url' => 'http://lorempixel.com/900/600/',
+            'full_title_tesim' => 'Another random image',
+            'spotlight_upload_description_tesim' => 'A random 900 by 600 image from lorempixel',
+            'spotlight_upload_attribution_tesim' => 'lorempixel.com',
+            'spotlight_upload_date_tesim' => '2014'
+          }
+        ]
+      end
+      before do
+        request.env['HTTP_REFERER'] = 'http://test.host/'
+      end
+      it 'starts an AddUploadsFromCSV job with the serialized CSV' do
+        expect(Spotlight::AddUploadsFromCSV).to receive(:perform_later).with(serialized_csv, exhibit, user).and_return(nil)
+        post :create, exhibit_id: exhibit, resources_csv_upload: { url: csv }
+      end
+      it 'sets the flash message' do
+        expect(Spotlight::AddUploadsFromCSV).to receive(:perform_later).and_return(nil)
+        post :create, exhibit_id: exhibit, resources_csv_upload: { url: csv }
+        expect(flash[:notice]).to eq "'csv-upload-fixture.csv' has been uploaded.  An email will be sent to you once indexing is complete."
+      end
+      it 'redirects back' do
+        expect(Spotlight::AddUploadsFromCSV).to receive(:perform_later).and_return(nil)
+        post :create, exhibit_id: exhibit, resources_csv_upload: { url: csv }
+        expect(response).to redirect_to :back
+      end
+    end
+  end
+end

data/spec/controllers/spotlight/resources/upload_controller_spec.rb

@@ -17,56 +17,6 @@ describe Spotlight::Resources::UploadController, type: :controller do
     let(:user) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
     before { sign_in user }
 
-    describe 'GET new' do
-      it 'is successful' do
-        expect(controller).to receive(:add_breadcrumb).with('Home', exhibit_path(exhibit))
-        expect(controller).to receive(:add_breadcrumb).with('Curation', exhibit_dashboard_path(exhibit))
-        expect(controller).to receive(:add_breadcrumb).with('Items', admin_exhibit_catalog_index_path(exhibit))
-        expect(controller).to receive(:add_breadcrumb).with('Add non-repository items', new_exhibit_resources_upload_path(exhibit))
-        get :new, exhibit_id: exhibit
-        expect(response).to be_successful
-      end
-    end
-
-    describe 'POST csv_upload' do
-      let(:csv) { fixture_file_upload(File.expand_path(File.join('..', 'spec', 'fixtures', 'csv-upload-fixture.csv'), Rails.root), 'text/csv') }
-      let(:serialized_csv) do
-        [
-          {
-            'url' => 'http://lorempixel.com/800/500/',
-            'full_title_tesim' => 'A random image',
-            'spotlight_upload_description_tesim' => 'A random 800 by 500 image from lorempixel',
-            'spotlight_upload_attribution_tesim' => 'lorempixel.com',
-            'spotlight_upload_date_tesim' => '2015'
-          },
-          {
-            'url' => 'http://lorempixel.com/900/600/',
-            'full_title_tesim' => 'Another random image',
-            'spotlight_upload_description_tesim' => 'A random 900 by 600 image from lorempixel',
-            'spotlight_upload_attribution_tesim' => 'lorempixel.com',
-            'spotlight_upload_date_tesim' => '2014'
-          }
-        ]
-      end
-      before do
-        request.env['HTTP_REFERER'] = 'http://test.host/'
-      end
-      it 'starts an AddUploadsFromCSV job with the serialized CSV' do
-        expect(Spotlight::AddUploadsFromCSV).to receive(:perform_later).with(serialized_csv, exhibit, user).and_return(nil)
-        post :csv_upload, exhibit_id: exhibit, resources_csv_upload: { url: csv }
-      end
-      it 'sets the flash message' do
-        expect(Spotlight::AddUploadsFromCSV).to receive(:perform_later).and_return(nil)
-        post :csv_upload, exhibit_id: exhibit, resources_csv_upload: { url: csv }
-        expect(flash[:notice]).to eq "'csv-upload-fixture.csv' has been uploaded.  An email will be sent to you once indexing is complete."
-      end
-      it 'redirects back' do
-        expect(Spotlight::AddUploadsFromCSV).to receive(:perform_later).and_return(nil)
-        post :csv_upload, exhibit_id: exhibit, resources_csv_upload: { url: csv }
-        expect(response).to redirect_to :back
-      end
-    end
-
     describe 'POST create' do
       let(:blacklight_solr) { double }
 
@@ -88,7 +38,7 @@ describe Spotlight::Resources::UploadController, type: :controller do
       it 'redirects to the upload form when the add-and-continue parameter is present' do
         post :create, exhibit_id: exhibit, 'add-and-continue' => 'true', resources_upload: { url: 'url-data' }
         expect(flash[:notice]).to eq 'Object uploaded successfully.'
-        expect(response).to redirect_to new_exhibit_resources_upload_path(exhibit)
+        expect(response).to redirect_to new_exhibit_resource_path(exhibit, anchor: 'new_resources_upload')
       end
     end
   end

data/spec/controllers/spotlight/resources_controller_spec.rb

@@ -43,18 +43,6 @@ describe Spotlight::ResourcesController, type: :controller do
         get :new, exhibit_id: exhibit
         expect(response).to render_template 'spotlight/resources/new'
       end
-
-      it 'populates the resource with parameters from the url' do
-        get :new, exhibit_id: exhibit, resource: { url: 'info:uri' }
-        expect(assigns[:resource].url).to eq 'info:uri'
-      end
-
-      describe 'Within a popup' do
-        it 'renders with the simplified popup layout' do
-          get :new, exhibit_id: exhibit, popup: true
-          expect(response).to render_template 'layouts/spotlight/popup'
-        end
-      end
     end
 
     describe 'GET monitor' do

data/spec/controllers/spotlight/roles_controller_spec.rb

@@ -116,7 +116,7 @@ describe Spotlight::RolesController, type: :controller do
 
       it 'redirects back with a flash notice upon success' do
         post :invite, exhibit_id: exhibit, user: 'user@example.com', role: 'curator'
-        expect(flash[:notice]).to eq 'User has been updated.'
+        expect(flash[:notice]).to eq 'User has been invited.'
         expect(response).to redirect_to(:back)
       end
 

data/spec/features/{upload_non_repository_item_spec.rb → add_items_spec.rb}

@@ -8,9 +8,11 @@ describe 'Uploading a non-repository item', type: :feature do
 
   describe 'forms' do
     it 'displays the single item upload form' do
-      visit spotlight.new_exhibit_resources_upload_path(exhibit)
+      visit spotlight.new_exhibit_resource_path(exhibit)
       expect(page).to have_css('h1', text: /Curation/)
-      expect(page).to have_css 'h1 small', text: 'Add non-repository items'
+      expect(page).to have_css 'h1 small', text: 'Add items'
+
+      click_link 'Upload item'
 
       within('form#new_resources_upload') do
         expect(page).to have_css('#resources_upload_url[type="file"]')
@@ -22,20 +24,12 @@ describe 'Uploading a non-repository item', type: :feature do
         expect(page).to have_css("#resources_upload_data_#{custom_field.field}[type='text']")
       end
     end
-    it 'displays the multi-item CSV upload form' do
-      visit spotlight.new_exhibit_resources_upload_path(exhibit)
-      expect(page).to have_css('h1', text: /Curation/)
-      expect(page).to have_css 'h1 small', text: 'Add non-repository items'
-      within('form#new_resources_csv_upload') do
-        expect(page).to have_css('#resources_csv_upload_url[type="file"]')
-        expect(page).to have_css('.help-block a', text: 'Download template')
-      end
-    end
-  end
 
-  describe 'upload' do
-    it 'creates a new non-repository item' do
-      visit spotlight.new_exhibit_resources_upload_path(exhibit)
+    it 'creates a new item' do
+      visit spotlight.new_exhibit_resource_path(exhibit)
+
+      click_link 'Upload item'
+
       attach_file('resources_upload_url', File.join(FIXTURES_PATH, '800x600.png'))
       fill_in 'Title', with: '800x600'
 
@@ -49,8 +43,26 @@ describe 'Uploading a non-repository item', type: :feature do
       Blacklight.default_index.connection.commit
     end
 
+    it 'displays the multi-item CSV upload form' do
+      visit spotlight.new_exhibit_resource_path(exhibit)
+      expect(page).to have_css('h1', text: /Curation/)
+      expect(page).to have_css 'h1 small', text: 'Add items'
+
+      click_link 'Upload multiple items'
+
+      within('form#new_resources_csv_upload') do
+        expect(page).to have_css('#resources_csv_upload_url[type="file"]')
+        expect(page).to have_css('.help-block a', text: 'Download template')
+      end
+    end
+  end
+
+  describe 'upload' do
     it 'is editable' do
-      visit spotlight.new_exhibit_resources_upload_path(exhibit)
+      visit spotlight.new_exhibit_resource_path(exhibit)
+
+      click_link 'Upload item'
+
       attach_file('resources_upload_url', File.join(FIXTURES_PATH, '800x600.png'))
       fill_in 'Title', with: '800x600'
 

data/spec/features/exhibits_index_spec.rb

@@ -12,6 +12,37 @@ describe 'Exhibits index page', type: :feature do
         expect(page).to have_selector 'h2', text: 'Some Exhibit Title'
       end
     end
+
+    context 'with tagged exhibits' do
+      before do
+        exhibit.tag_list = %w(a)
+        other_exhibit.tag_list = %w(a b)
+
+        exhibit.save
+        other_exhibit.save
+      end
+
+      it 'shows controls to filter exhibits by tags' do
+        visit spotlight.exhibits_path
+
+        expect(page).to have_selector '.exhibit-card', count: 2
+
+        within '.tags' do
+          expect(page).to have_selector '.active', text: 'All'
+
+          click_link 'a'
+        end
+
+        expect(page).to have_selector '.exhibit-card', count: 2
+
+        within '.tags' do
+          expect(page).to have_selector '.active', text: 'a'
+          click_link 'b'
+        end
+
+        expect(page).to have_selector '.exhibit-card', count: 1
+      end
+    end
   end
 
   context 'with a single exhibit' do

data/spec/features/site_admin_management_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+describe 'Site admin management', js: true do
+  let(:user) { FactoryGirl.create(:site_admin) }
+  let(:existing_user) { FactoryGirl.create(:exhibit_visitor) }
+
+  before do
+    login_as(user)
+    visit spotlight.admin_users_path
+  end
+
+  it 'displays the current admin users' do
+    expect(page).to have_css('td', text: user.email)
+  end
+
+  it 'allows for existing users to be added as site adminstrators' do
+    expect(page).not_to have_css('td', text: existing_user.email)
+    click_link 'Add new administrator'
+
+    fill_in 'user_email', with: existing_user.email
+    click_button 'Add role'
+
+    expect(page).to have_content('Added user as exhibts adminstrator')
+    expect(page).to have_css('td', text: existing_user.email)
+  end
+
+  it 'allows non-existing users to be invited' do
+    click_link 'Add new administrator'
+
+    fill_in 'user_email', with: 'not-an-existing-user@example.com'
+
+    expect(page).to have_content('This user does not yet exist. Would you like to send them an invite?')
+
+    expect { click_link('invite') }.to change { ActionMailer::Base.deliveries.count }.by(1)
+
+    expect(page).to have_content('User has been invited.')
+  end
+
+  it 'allows the admin to remove the admin role from the user' do
+    click_link 'Add new administrator'
+
+    fill_in 'user_email', with: 'not-an-admin@example.com'
+
+    click_link 'invite'
+    expect(page).to have_content('User has been invited.')
+
+    expect(page).to have_css(:td, text: 'not-an-admin@example.com')
+
+    expect(page).to have_css(:a, text: 'Remove from role', count: 2)
+    within(all('table tbody tr').last) do
+      click_link 'Remove from role'
+    end
+
+    expect(page).to have_content 'User removed from site adminstrator role'
+    expect(page).to have_css(:a, text: 'Remove from role', count: 1)
+
+    expect(page).not_to have_css(:td, text: 'not-an-admin@example.com')
+  end
+
+  it 'does not provide a button for users to remove their own adminstrator privs' do
+    click_link 'Add new administrator'
+
+    expect(page).to have_css('td', text: user.email)
+    # There are two users, the original site admin and our admin user so only one button
+    expect(page).to have_css(:a, text: 'Remove from role', count: 1)
+  end
+end

data/spec/models/spotlight/resource_spec.rb

@@ -89,15 +89,6 @@ describe Spotlight::Resource, type: :model do
     end
   end
 
-  describe '#becomes_provider' do
-    it 'converts the resource to a provider-specific resource' do
-      SomeClass = Class.new(described_class)
-      allow(Spotlight::ResourceProvider).to receive_messages(for_resource: SomeClass)
-      expect(subject.becomes_provider).to be_a_kind_of(SomeClass)
-      expect(subject.becomes_provider.type).to eq 'SomeClass'
-    end
-  end
-
   describe '#save_and_index' do
     before do
       allow(subject.send(:blacklight_solr)).to receive(:update)

data/spec/views/spotlight/catalog/admin.html.erb_spec.rb

@@ -7,8 +7,7 @@ module Spotlight
       allow(view).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)
       allow(view).to receive(:spotlight_page_path_for).and_return(nil)
       allow(view).to receive(:current_exhibit).and_return(exhibit)
-      allow(view).to receive(:new_exhibit_catalog_path).and_return('')
-      allow(view).to receive(:new_exhibit_resources_upload_path).and_return('')
+      allow(view).to receive(:new_exhibit_resource_path).and_return('')
       allow(view).to receive(:reindex_all_exhibit_resources_path).and_return('')
       allow(view).to receive(:monitor_exhibit_resources_path).and_return('')
       assign(:exhibit, exhibit)
@@ -23,16 +22,16 @@ module Spotlight
       expect(rendered).to have_link 'Browse'
     end
 
-    it "does not render the 'add repository item' link if no repository sources are configured" do
-      allow(Spotlight::Engine.config).to receive(:new_resource_partials).and_return([])
+    it "renders the 'add items' link if any repository sources are configured" do
+      allow(Spotlight::Engine.config).to receive(:resource_partials).and_return(['a'])
       render
-      expect(rendered).to_not have_link 'Add repository item'
+      expect(rendered).to have_link 'Add items'
     end
 
-    it "does not render the 'add repository item' link if no repository sources are configured" do
-      allow(Spotlight::Engine.config).to receive(:new_resource_partials).and_return(['a'])
+    it "does not render the 'add items' link if no repository sources are configured" do
+      allow(Spotlight::Engine.config).to receive(:resource_partials).and_return([])
       render
-      expect(rendered).to have_link 'Add repository item'
+      expect(rendered).not_to have_link 'Add items'
     end
   end
 end

data/spec/views/spotlight/exhibits/index.html.erb_spec.rb

@@ -3,12 +3,15 @@ require 'spec_helper'
 module Spotlight
   describe 'spotlight/exhibits/index', type: :view do
     let(:exhibits) { Spotlight::Exhibit.none }
+    let(:published_exhibits) { exhibits.published.page(1) }
+
     let(:ability) { ::Ability.new(user) }
     let(:user) { Spotlight::Engine.user_class.new }
 
     before do
       assign(:exhibits, exhibits)
-      allow(view).to receive_messages(exhibit_path: '/', current_user: user, current_ability: ability)
+      assign(:published_exhibits, published_exhibits)
+      allow(view).to receive_messages(exhibits_path: '/', exhibit_path: '/', current_user: user, current_ability: ability)
     end
 
     context 'with published exhibits' do
@@ -35,6 +38,49 @@ module Spotlight
         expect(rendered).not_to have_selector '.nav-tabs'
       end
 
+      it 'does not include tags controls' do
+        render
+
+        expect(rendered).not_to have_selector '.tags'
+      end
+
+      it 'does not include pagination controls' do
+        render
+
+        expect(rendered).not_to have_selector '.pager'
+      end
+
+      context 'with tagged exhibits' do
+        before do
+          exhibit_a.tag_list = ['a']
+          exhibit_b.tag_list = ['a']
+          exhibit_c.tag_list = ['b']
+
+          exhibit_a.save
+          exhibit_b.save
+          exhibit_c.save
+        end
+
+        it 'filters by tags' do
+          render
+
+          expect(rendered).to have_link 'All'
+          expect(rendered).to have_link 'a'
+          expect(rendered).to have_link 'b'
+        end
+      end
+
+      context 'with paginated exhibits' do
+        let(:published_exhibits) { exhibits.published.page(1).per(1) }
+
+        it 'renders pagination controls' do
+          render
+
+          expect(rendered).to have_selector '.pager'
+          expect(rendered).to have_link 'Next', href: '/?page=2'
+        end
+      end
+
       context 'with an exhibit admin' do
         let(:user) { FactoryGirl.create(:exhibit_admin) }