blacklight-spotlight 0.3.1 → 0.4.1

data/spec/controllers/spotlight/solr_controller_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+describe Spotlight::SolrController, type: :controller do
+  routes { Spotlight::Engine.routes }
+  let(:exhibit) {FactoryGirl.create(:exhibit) }
+
+  describe "when user does not have access" do
+    before { sign_in FactoryGirl.create(:exhibit_visitor) }
+    it "should not allow update" do
+      post :update, exhibit_id: exhibit
+      expect(response).to redirect_to main_app.root_path
+    end
+  end
+  
+  describe "when user is an admin" do
+    let(:admin) { FactoryGirl.create(:site_admin) }
+    let(:role) { admin.roles.first }
+    let(:solr) { double }
+    before { sign_in admin }
+    before do
+      expect(controller).to receive(:blacklight_solr).and_return(solr)
+    end
+
+    it "should pass through the request data" do
+      doc = {}
+      expect(solr).to receive(:update) do |arr|
+        doc = arr.first
+      end
+
+      post :update, {a: 1}.to_json, content_type: :json, exhibit_id: exhibit
+
+      expect(response).to be_successful
+      expect(doc).to include "a" => 1
+    end
+
+    it "should enrich the request with exhibit solr data" do
+      doc = {}
+      expect(solr).to receive(:update) do |arr|
+        doc = arr.first
+      end
+
+      post :update, {a: 1}.to_json, content_type: :json, exhibit_id: exhibit
+
+      expect(response).to be_successful
+      expect(doc).to include exhibit.solr_data
+    end
+
+    it "should enrich the request with sidecar data" do
+      doc = {}
+      expect(solr).to receive(:update) do |arr|
+        doc = arr.first
+      end
+
+      allow_any_instance_of(SolrDocument).to receive(:to_solr).and_return(b: 1)
+
+      post :update, {a: 1}.to_json, content_type: :json, exhibit_id: exhibit
+
+      expect(response).to be_successful
+      expect(doc).to include b: 1
+    end
+  end
+
+end

data/spec/factories/exhibits.rb

@@ -1,6 +1,7 @@
 FactoryGirl.define do
   factory :exhibit, class: Spotlight::Exhibit do
     sequence(:title) { |n| "Exhibit Title #{n}" }
+    after(:build) { |exhibit| exhibit.searches << FactoryGirl.build(:default_search) }
   end
 end
   

data/spec/factories/searches.rb

@@ -2,7 +2,6 @@ FactoryGirl.define do
   factory :search, class: Spotlight::Search do
     exhibit
     title "Search1"
-    featured_item_id 'dq287tq6352'
   end
 
   factory :published_search, class: Spotlight::Search do
@@ -10,6 +9,17 @@ FactoryGirl.define do
     title "Search1"
     on_landing_page true
   end
+
+  factory :default_search, class: Spotlight::Search do
+    title "All Exhibit Items"
+    long_description "All items in this exhibit."
+    
+    after(:build) { |search| search.thumbnail = FactoryGirl.create(:featured_image)}
+  end
+
+  factory :featured_image, class: Spotlight::FeaturedImage do
+    image { File.open(File.join(FIXTURES_PATH, "avatar.png")) }
+  end
 end
   
 

data/spec/features/add_custom_field_metadata_spec.rb

@@ -30,4 +30,27 @@ describe "Adding custom metadata field data", :type => :feature do
     expect(page).to have_content "My new custom field value"
 
   end
+
+  it "should have a public toggle" do
+    visit spotlight.exhibit_catalog_path(exhibit, "dq287tq6352")
+
+    expect(page).not_to have_selector ".blacklight-private"
+
+    click_on "Edit"
+
+    uncheck "Public"
+
+    click_on "Save changes"
+
+    expect(page).to have_selector ".blacklight-private"
+
+    click_on "Edit"
+
+    check "Public"
+
+    click_on "Save changes"
+
+    expect(page).not_to have_selector ".blacklight-private"
+
+  end
 end

data/spec/features/browse_category_admin_spec.rb

@@ -21,6 +21,48 @@ describe "Browse Category Administration", :type => :feature do
         expect(page).to have_content "Value"
       end
     end
+    
+    it 'should attach a masthead image' do
+      visit spotlight.edit_exhibit_search_path exhibit, search
+
+      click_link "Masthead"
+      
+      within "#search-masthead" do
+        choose "Upload an image"
+        attach_file('search_masthead_attributes_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')));
+      end
+
+      click_button "Save changes"
+
+      expect(page).to have_content("The search was successfully updated.")
+
+      search.reload
+
+      expect(search.masthead).not_to be nil
+      expect(search.masthead.image.cropped).not_to be_nil
+      expect(search.masthead.image.path).to end_with "avatar.png"
+    end
+
+    it 'should attach a thumbnail image' do
+      visit spotlight.edit_exhibit_search_path exhibit, search
+
+      click_link "Thumbnail"
+      
+      within "#search-thumbnail" do
+        choose "Upload an image"
+        attach_file('search_thumbnail_attributes_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')));
+      end
+
+      click_button "Save changes"
+
+      expect(page).to have_content("The search was successfully updated.")
+
+      search.reload
+
+      expect(search.thumbnail).not_to be nil
+      expect(search.thumbnail.image.thumb).not_to be_nil
+      expect(search.thumbnail.image.path).to end_with "avatar.png"
+    end
   end
   describe "destroy" do
     it "should destroy a tag" do

data/spec/features/catalog_spec.rb

@@ -11,14 +11,14 @@ describe "Catalog", :type => :feature do
       d = SolrDocument.new(id: 'dq287tq6352')
       d.make_private! exhibit
       d.reindex
-      Blacklight.solr.commit
+      Blacklight.default_index.connection.commit
     end
     
     after do
       d = SolrDocument.new(id: 'dq287tq6352')
       d.make_public! exhibit
       d.reindex
-      Blacklight.solr.commit
+      Blacklight.default_index.connection.commit
     end
 
     it "should have a 'Item Visiblity' facet" do

data/spec/features/create_exhibit_spec.rb

@@ -13,36 +13,26 @@ describe "Create a new exhibit", :type => :feature do
     expect(page).to have_selector "h1 small", text: "Create a new exhibit"
   end
 
-  it "should allow admins to create a new exhibit" do
+  it 'should have a contact emails field' do
     visit '/'
     within '.dropdown-menu' do
       click_link "Create Exhibit"
     end
-
-    fill_in "Title", with: "My exhibit title"
-    fill_in "Subtitle", with: "Some subtitle"
-    fill_in "Description", with: "A short description of the exhibit"
-
-    click_button "Save"
-
-    expect(page).to have_content "The exhibit was created."
+    expect(page).to have_css('#exhibit_contact_emails_attributes_0_email')
   end
 
-  it "should allow admins to include a featured image" do
+  it "should allow admins to create a new exhibit" do
     visit '/'
     within '.dropdown-menu' do
       click_link "Create Exhibit"
     end
-    
+
     fill_in "Title", with: "My exhibit title"
-    attach_file('exhibit_featured_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')));
+    fill_in "Subtitle", with: "Some subtitle"
+    fill_in "Description", with: "A short description of the exhibit"
 
     click_button "Save"
 
     expect(page).to have_content "The exhibit was created."
-    within "#exhibit-navbar" do
-      click_link "Home"
-    end
-    expect(page).to have_css "meta[name='twitter:image']", visible: false
   end
 end

data/spec/features/exhibits/add_tags_spec.rb

@@ -22,10 +22,10 @@ describe "Add tags to an item in an exhibit", :type => :feature do
 
     visit spotlight.exhibit_catalog_path(exhibit, "dq287tq6352")
 
-    within("ul.tags") do
-      expect(page).to have_selector  "li", text: "One"
-      expect(page).to have_selector  "li", text: "Two and a half"
-      expect(page).to have_selector  "li", text: "Three"
+    within("dd.blacklight-exhibit_tags") do
+      expect(page).to have_selector  "a", text: "One"
+      expect(page).to have_selector  "a", text: "Two and a half"
+      expect(page).to have_selector  "a", text: "Three"
     end
 
     click_on "Two and a half"

data/spec/features/exhibits/custom_metadata_fields_spec.rb

@@ -52,4 +52,25 @@ describe "Adding custom metadata fields", type: :feature do
     click_on "Add new field"
     expect(page).to have_breadcrumbs "Home", "Curation", "Metadata", "Add new field"
   end
+
+  it "should let the curator choose the type of field on create" do
+    visit spotlight.exhibit_edit_metadata_path exhibit
+    click_on "Add new field"
+    fill_in "Label", with: "My new custom field"
+
+    choose "Controlled vocabulary"
+    click_on "Save"
+
+    expect(page).to have_content "The custom field was created."
+    within "#exhibit-specific-fields" do
+      # Edit
+      click_link "Edit"
+    end
+    
+    expect(page).to have_checked_field "Controlled vocabulary"
+    expect(page).to have_unchecked_field "Free text"
+
+    visit spotlight.exhibit_edit_facets_path exhibit
+    expect(page).to have_content "My new custom field"
+  end
 end

data/spec/features/feature_page_spec.rb

@@ -108,7 +108,6 @@ describe "Feature page", :type => :feature do
     end
 
     it "should release the lock when the lock holder cancels edits", js: true do
-
       # open the edit page
       visit spotlight.edit_exhibit_feature_page_path(feature_page.exhibit, feature_page)
 

data/spec/features/import_exhibit_spec.rb

@@ -1,40 +1,55 @@
 require 'spec_helper'
 require 'tempfile'
 
-describe "Allow exhibit admins to import and export content from an exhibit", :type => :feature do
+describe "Allow exhibit admins to import and export content from an exhibit", type: :feature, js: true do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:user) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
   before { login_as user }
 
-  it "should allow admins to export content from an exhibit" do
+  pending "should allow admins to export content from an exhibit" do
+    pending("There's not really any good way to test the contents of a downloaded file with Poltergeist (which is now necessary since we've moved the export option behind a bootstrap tab)")
     visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
+
+    click_link user.email
     within '#user-util-collapse .dropdown-menu' do
       click_link 'Dashboard'
     end
 
-    click_link "Import/Export"
-    click_link "Export data"
+    click_link "Settings"
+    within(".nav-tabs") do
+      click_link "Export data"
+    end
+    within("#export") do
+      click_link "Export data"
+    end
 
     data = JSON.parse(page.body)
 
     expect(data).to include "title", "searches", "home_page"
-
   end
 
   it "should allow admins to import content into an exhibit" do
     visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
+
+    click_link user.email
     within '#user-util-collapse .dropdown-menu' do
       click_link 'Dashboard'
     end
 
-    click_link "Import/Export"
+    click_link "Settings"
+
+    within(".nav-tabs") do
+      click_link "Import data"
+    end
 
     file = Tempfile.new('foo')
     file.write({"title" => "A better title"}.to_json)
     file.rewind
     begin
       attach_file("file", File.expand_path(file.path))
-      click_button "Import data"
+      within("#import") do
+        click_button "Import data"
+      end
     ensure
       file.close
       file.unlink
@@ -42,10 +57,4 @@ describe "Allow exhibit admins to import and export content from an exhibit", :t
     expect(page).to have_content "The exhibit was successfully updated."
     expect(page).to have_content "A better title"
   end
-
-  it "should have breadcrumbs" do
-    visit spotlight.import_exhibit_path exhibit
-
-    expect(page).to have_breadcrumbs "Home", "Administration", "Import/Export"
-  end
 end

data/spec/features/javascript/about_page_admin_spec.rb

@@ -6,7 +6,6 @@ feature "About Pages Adminstration", js: true do
   before { login_as exhibit_curator }
 
   it "should be able to create new pages" do
-    skip("Passing locally but Travis is throwing intermittent errors") if ENV["CI"]
     login_as exhibit_curator
 
     visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)

data/spec/features/javascript/block_controls_spec.rb

@@ -5,8 +5,7 @@ feature "Block controls" do
   let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
   before { login_as exhibit_curator }
 
-  scenario "should be split into separate sections", :js => true do
-    skip("Passing locally but Travis is throwing intermittent error because it doesn't seem to wait for form to be submitted.") if ENV["CI"]
+  scenario "should be split into separate sections", js: true do
     # create page
     visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
     click_link exhibit_curator.email

data/spec/features/javascript/blocks/featured_browse_categories_block_spec.rb

@@ -0,0 +1,37 @@
+require "spec_helper"
+
+describe "Featured Browse Category Block", type: :feature, js: true do
+  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+
+  let!(:feature_page) { FactoryGirl.create(:feature_page, exhibit: exhibit) }
+  let!(:search1) { FactoryGirl.create(:published_search, exhibit: exhibit, title: "Title1", on_landing_page: true) }
+  let!(:search2) { FactoryGirl.create(:published_search, exhibit: exhibit, title: "Title2", on_landing_page: true) }
+
+  before do
+    login_as exhibit_curator
+
+    visit spotlight.edit_exhibit_feature_page_path(exhibit, feature_page)
+    add_widget 'browse'
+  end
+
+  it "should allow a curator to select from existing browse categories" do
+    check "Include item counts?"
+
+    fill_in_typeahead_field with: "Title1"
+    
+    within(:css, '.panel') do
+      uncheck "Display?"
+    end
+
+    fill_in_typeahead_field with: "Title2"
+
+    save_page
+
+    # Documents should exist
+    expect(page).not_to have_css('.category-title', text: search1.title)
+    expect(page).to have_css('.category-title', text: search2.title)
+    expect(page).to have_css('.item-count', text: /\d+ items/i)
+
+  end
+end

data/spec/features/javascript/blocks/featured_pages_block_spec.rb

@@ -0,0 +1,33 @@
+require "spec_helper"
+
+describe "Featured Pages Blocks", type: :feature do
+  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let!(:feature_page) {
+    FactoryGirl.create(
+      :feature_page,
+      title: "xyz",
+      exhibit: exhibit
+    )
+  }
+
+  let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+
+  before do
+    login_as exhibit_curator
+  end
+
+  it 'should save the selected exhibits', js: true do
+    visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
+
+    click_link("Edit")
+
+    add_widget 'featured_pages'
+    
+    fill_in_typeahead_field with: "xyz"
+    
+    save_page
+
+    expect(page).to have_content "xyz"
+  end
+
+end