blacklight-spotlight 0.3.1 → 0.4.1

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

@@ -0,0 +1,41 @@
+require "spec_helper"
+
+describe "Search Result 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!(:alt_search) { FactoryGirl.create(:search, title: "Alt. Search", exhibit: exhibit) }
+
+  before do
+    login_as exhibit_curator
+
+    exhibit.searches.each { |x| x.on_landing_page = true; x.save }
+
+    visit spotlight.edit_exhibit_feature_page_path(exhibit, feature_page)
+    add_widget 'search_results'
+  end
+
+  it "should allow a curator to select from existing browse categories" do
+    fill_in_typeahead_field with: "All Exhibit Items"
+
+    check "Gallery"
+    check "Slideshow"
+
+    save_page
+
+    expect(page).not_to have_content "per page"
+    expect(page).not_to have_content "Sort by"
+    
+    # The two configured view types should be
+    # present and the one not selected should not be
+    within(".view-type-group") do
+      expect(page).not_to have_css(".view-type-list")
+      expect(page).to     have_css(".view-type-gallery")
+      expect(page).to     have_css(".view-type-slideshow")
+    end
+
+    # Documents should exist
+    expect(page).to have_css(".documents .document")
+  end
+end

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

@@ -0,0 +1,164 @@
+require "spec_helper"
+
+feature "Solr Document Block", feature: true do
+  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+  let(:feature_page) do
+    FactoryGirl.create(
+      :feature_page,
+      title: "FeaturePage1",
+      exhibit: exhibit
+    )
+  end
+
+  before do
+    login_as exhibit_curator
+    visit spotlight.edit_exhibit_feature_page_path(exhibit, feature_page)
+    add_widget 'solr_documents'
+  end
+
+  scenario "it should allow you to add the solr document block widget", js: true do
+    expect(page).to have_content "This widget displays exhibit items in a horizontal row. Optionally, you can add a heading and/or text to be displayed adjacent to the items."
+    expect(page).to have_content "Primary caption"
+    expect(page).to have_content "Secondary caption"
+    expect(page).to have_content "Display text on"
+    expect(page).to have_content "Heading"
+    expect(page).to have_content "Text"
+  end
+
+  scenario "it should allow you to add a solr document to the widget", js: true do
+    fill_in_typeahead_field with: "dq287tq6352"
+    within(:css, '.panel') do
+      expect(page).to have_content "L'AMERIQUE"
+    end
+
+    save_page
+
+    # verify that the item + image widget is displaying an image from the document.
+    within(:css, ".items-block") do
+      expect(page).to have_css(".thumbnail")
+      expect(page).to have_css(".thumbnail a img")
+      expect(page).not_to have_css(".title")
+    end
+  end
+
+  scenario "it should allow you to add multiple solr documents to the widget", js: true do
+    fill_in_typeahead_field with: "dq287tq6352"
+    fill_in_typeahead_field with: "gk446cj2442"
+
+    save_page
+
+    expect(page).to have_selector ".items-block .box", count: 2
+  end
+
+  scenario "it should allow you toggle visibility of solr documents", js: true do
+    fill_in_typeahead_field with: "dq287tq6352"
+
+    within(:css, '.panel') do
+      uncheck "Display?"
+    end
+
+    fill_in_typeahead_field with: "gk446cj2442"
+
+    # display the title as the primary caption
+    within('.primary-caption') do
+      check("Primary caption")
+      select("Title", from: 'primary-caption-field')
+    end
+
+    save_page
+
+    expect(page).to have_selector ".items-block .box", count: 1
+    expect(page).to have_content "[World map]"
+    expect(page).not_to have_content "L'AMERIQUE"
+  end
+
+  scenario "should allow you to optionally display captions with the image", js: true do
+    fill_in_typeahead_field with: "gk446cj2442"
+
+    # display the title as the primary caption
+    within('.primary-caption') do
+      check("Primary caption")
+      select("Title", from: 'primary-caption-field')
+    end
+    # display the language as the secondary caption
+    within('.secondary-caption') do
+      check("Secondary caption")
+      select("Language", from: 'secondary-caption-field')
+    end
+    # create the page
+    save_page
+
+    # verify that the item + image widget is displaying image and title from the requested document.
+    within(:css, ".items-block") do
+      expect(page).to have_css(".thumbnail")
+      expect(page).to have_css(".thumbnail a img")
+      expect(page).to have_css(".primary-caption", text: "[World map]")
+      expect(page).to have_css(".secondary-caption", text: "Latin")
+    end
+  end
+
+  scenario "should allow you to add text to the image", js: true do
+
+    # fill in the content-editable div
+    content_editable = find(".st-text-block")
+    content_editable.set("zzz")
+    # create the page
+    save_page
+
+    # visit the show page for the document we just saved
+    # verify that the item + image widget is displaying image and title from the requested document.
+    within(:css, ".items-block") do
+      expect(page).to have_content "zzz"
+    end
+  end
+
+  scenario "should allow you to choose which side the text will be on", js: true do
+
+    # fill in the content editable div
+    content_editable = find(".st-text-block")
+    content_editable.set("zzz")
+    # Select to align the text right
+    choose "Right"
+    # create the page
+    save_page
+
+    # verify that the item + image widget is displaying image and title from the requested document.
+    within(:css, ".items-block") do
+      expect(page).to have_content "zzz"
+      expect(page).to have_css(".text-col.pull-right")
+    end
+  end
+
+  scenario "round-trip data", js: true do
+    fill_in_typeahead_field with: "dq287tq6352"
+
+    within(:css, '.panel') do
+      uncheck "Display?"
+    end
+
+    fill_in_typeahead_field with: "gk446cj2442"
+
+    # display the title as the primary caption
+    within('.primary-caption') do
+      check("Primary caption")
+      select("Title", from: 'primary-caption-field')
+    end
+
+    # fill in the content editable div
+    content_editable = find(".st-text-block")
+    content_editable.set("zzz")
+    # Select to align the text right
+    choose "Right"
+
+    save_page
+
+    click_on "Edit"
+
+    expect(page).to have_selector ".panel", count: 2
+
+    # for some reason, the text area above isn't getting filled in
+    # expect(page).to have_selector ".st-text-block", text: "zzz"
+    expect(find_field("primary-caption-field").value).to eq "full_title_tesim"
+  end
+end

data/spec/features/javascript/edit_in_place_spec.rb

@@ -4,9 +4,33 @@ describe 'Edit in place', type: :feature, js: true do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:admin)   { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
   before { login_as admin }
+  describe 'Feature Pages' do
+    it 'should update the label' do
+      visit spotlight.exhibit_dashboard_path(exhibit)
+
+      click_link "Feature pages"
+
+      add_new_page_via_button("My New Feature Page")
+
+      expect(page).to have_css('h3', text: "My New Feature Page")
+
+      within('.feature_pages_admin') do
+        expect(page).to     have_css('#exhibit_feature_pages_attributes_0_title[type="hidden"]', visible: false)
+        expect(page).not_to have_css('#exhibit_feature_pages_attributes_0_title[type="text"]')
+        click_link("My New Feature Page")
+        expect(page).not_to have_css('#exhibit_feature_pages_attributes_0_title[type="hidden"]')
+        expect(page).to     have_css('#exhibit_feature_pages_attributes_0_title[type="text"]')
+        fill_in 'exhibit_feature_pages_attributes_0_title', with: "My Newer Feature Page"
+      end
+      click_button "Save changes"
+
+      expect(page).to have_content("Feature pages were successfully updated.")
+      expect(page).to have_css('h3', text: "My Newer Feature Page")
+      expect(page).to_not have_css('h3', text: "My New Feature Page")
+    end
+  end
   describe 'Main navigation' do
     it 'should update the label' do
-      skip("Passing locally but Travis is throwing intermittent errors") if ENV["CI"]
       visit spotlight.exhibit_dashboard_path(exhibit)
 
       within "#sidebar" do
@@ -37,7 +61,6 @@ describe 'Edit in place', type: :feature, js: true do
   end
   describe 'Sort fields' do
     it 'should update the label' do
-      skip("Passing locally but Travis is throwing intermittent errors") if ENV["CI"]
       visit spotlight.exhibit_edit_sort_fields_path(exhibit)
 
       within "#sidebar" do

data/spec/features/javascript/facet_admin_spec.rb

@@ -5,7 +5,6 @@ feature "Facets Administration", js:  true do
   let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
   before { login_as exhibit_curator }
   it "should allow us to update the label with edit-in-place" do
-    skip("Passing locally but Travis is throwing intermittent errors") if ENV["CI"]
 
     input_id = "blacklight_configuration_facet_fields_genre_ssim_label"
     visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)

data/spec/features/javascript/feature_page_admin_spec.rb

@@ -20,7 +20,6 @@ feature "Feature 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)
@@ -66,35 +65,19 @@ feature "Feature Pages Adminstration", js:  true do
   end
 
   it "should stay in curation mode if a user has unsaved data" do
-    visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
-    click_link exhibit_curator.email
-    within '#user-util-collapse .dropdown' do
-      click_link 'Dashboard'
-    end
-    click_link "Feature pages"
-    within("[data-id='#{page1.id}']") do
-      click_link "Edit"
-    end
+    visit spotlight.edit_exhibit_feature_page_path(page1.exhibit, page1)
+
     fill_in("Title", with: "Some Fancy Title")
     click_link "Cancel"
     expect(page).not_to have_selector 'a', text: "Edit"
   end
 
   it "should stay in curation mode if a user has unsaved contenteditable data" do
-    visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
-    click_link exhibit_curator.email
-    within '#user-util-collapse .dropdown' do
-      click_link 'Dashboard'
-    end
-
-    click_link "Feature pages"
-    within("[data-id='#{page1.id}']") do
-      click_link "Edit"
-    end
+    visit spotlight.edit_exhibit_feature_page_path(page1.exhibit, page1)
 
-    add_widget 'item-text'
+    add_widget 'solr_documents'
     content_editable = find(".st-text-block")
-    content_editable.set("Some Facnty Text.")
+    content_editable.set("Some Fancy Text.")
 
     click_link "Cancel"
     expect(page).not_to have_selector 'a', text: "Edit"

data/spec/features/javascript/home_page_edit_spec.rb

@@ -7,7 +7,6 @@ feature "Editing the Home Page", js: true do
   before { login_as admin }
 
   it "should not have a search results widget" do
-    skip("Passing locally but Travis is throwing intermittent errors") if ENV["CI"]
     visit spotlight.edit_exhibit_home_page_path(exhibit)
     add_widget
     within("[data-icon='add']") do

data/spec/features/javascript/multi_image_select_spec.rb

@@ -3,28 +3,23 @@ require "spec_helper"
 describe "Multi image selector", 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(:feature_page) { FactoryGirl.create(:feature_page, exhibit: exhibit) }
   before { login_as exhibit_curator }
 
   it "should allow the user to select which image in a multi image object to display" do
-    skip("Passing locally but Travis is throwing intermittent errors") if ENV["CI"]
-    exhibit.home_page.content = "[]"
-    exhibit.home_page.save
-
-    visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
-    click_link exhibit_curator.email
-    within '#user-util-collapse .dropdown' do
-      click_link 'Dashboard'
-    end
-    click_link "Feature pages"
-
-    within("[data-id='#{feature_page.id}']") do
-      click_link "Edit"
-    end
 
-    add_widget 'multi-up-item-grid'
+    visit spotlight.edit_exhibit_feature_page_path(exhibit, feature_page)
+    
+    add_widget 'solr_documents'
+    
+    fill_in_typeahead_field with: "xd327cm9378"
+    
+    expect(page).to have_selector ".panel"
 
-    fill_in_typeahead_field "item-grid-id_0_title", with: "xd327cm9378"
+    within('.panel') do
+      expect(page).to have_content(/Image \d of \d/)
+      expect(page).to have_link "Change"
+    end
 
     save_page
     
@@ -36,9 +31,9 @@ describe "Multi image selector", type: :feature, js: true do
 
     click_link("Edit")
 
-    within('.item-grid-admin') do
+    within('.panel') do
       expect(page).to have_content(/Image \d of \d/)
-      click_link("Change")
+      find('a', text: "Change").trigger('click')
     end
 
     expect(page).to have_css(".thumbs-list ul", visible: true)

data/spec/features/javascript/preview_block_spec.rb

@@ -3,44 +3,33 @@ require "spec_helper"
 feature "Block preview" do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
-  before { login_as exhibit_curator }
-
-  scenario "should allow you to preview a widget", :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"]
-    # create page
-    visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
-    click_link exhibit_curator.email
-    within '#user-util-collapse .dropdown' do
-      click_link 'Dashboard'
-    end
-    click_link "Feature pages"
+  let(:feature_page) do
+    FactoryGirl.create(
+      :feature_page,
+      title: "FeaturePage1",
+      exhibit: exhibit
+    )
+  end
 
-    add_new_page_via_button("My New Feature Page")
+  before do 
+    login_as exhibit_curator
+    visit spotlight.edit_exhibit_feature_page_path(exhibit, feature_page)
+  end
 
-    expect(page).to have_css("h3", text: "My New Feature Page")
+  scenario "should allow you to preview a widget", js: true do
 
-    expect(page).to have_content("The feature page was created.")
-    within("li.dd-item") do
-      click_link "Edit"
-    end
-    # fill in title
-    fill_in "feature_page_title", :with => "Exhibit Title"
-    # click to add widget
-    add_widget 'item-text'
-    # fill in the hidden record ID field
-    # TODO: Do we need an additional test for the typeahead?
-    item_id_field = find("input[name='item-id']", visible: false)
-    item_id_field.set("dq287tq6352")
+    add_widget 'solr_documents'
+    fill_in_typeahead_field with: "dq287tq6352"
 
     # display the title as the primary caption
     within('.primary-caption') do
       check("Primary caption")
-      select("Title", from: 'item-grid-primary-caption-field')
+      select("Title", from: 'primary-caption-field')
     end
 
-    # create the page
-    click_button("Preview")
-    # verify that the page was created
+    # Preview page
+    find('a[data-icon="preview"]').trigger('click')
+    # verify that the page was previewed
     expect(page).to have_css('.preview')
     # verify that the item + image widget is displaying an image from the document.
     within(:css, ".preview") do
@@ -48,4 +37,4 @@ feature "Block preview" do
       expect(page).to have_content "L'AMERIQUE"
     end
   end
-end
+end

data/spec/features/javascript/rule_block_spec.rb

@@ -7,7 +7,6 @@ describe "Horizontal rule block", type: :feature, js: true do
   before { login_as exhibit_curator }
 
   it "should allow the user to select which image in a multi image object to display" do
-    skip("Passing locally but Travis is throwing intermittent errors") if ENV["CI"]
     exhibit.home_page.content = "[]"
     exhibit.home_page.save
 

data/spec/features/javascript/search_context_spec.rb

@@ -3,75 +3,75 @@ require "spec_helper"
 feature "Search contexts" do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+  let(:feature_page) do
+    FactoryGirl.create(
+      :feature_page,
+      title: "FeaturePage1",
+      exhibit: exhibit
+    )
+  end
   before { login_as exhibit_curator }
 
   scenario "should add context breadcrumbs back to the home page when navigating to an item from the home page", :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"]
-    exhibit.home_page.content = "[]"
+    exhibit.home_page.content = [
+      {
+        type: "solr_documents", 
+        data: { 
+          item: {
+            dq287tq6352: {
+              id: "dq287tq6352", 
+              display: "true"
+            }
+          }
+        }
+      }].to_json
     exhibit.home_page.save
-    visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
-
-    click_link "Edit"
-
-    # click to add widget
-    add_widget 'item-text'
 
-    
-    fill_in_typeahead_field "item-text-id", with: "dq287tq6352"
+    visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
 
-    save_page
     # verify that the item + image widget is displaying an image from the document.
-    within(:css, ".item-text") do
+    within(:css, ".items-block") do
       expect(page).to have_css(".thumbnail")
       expect(page).to have_css(".thumbnail a img")
       expect(page).not_to have_css(".title")
     end
 
-    find('.thumbnail a').click
+    find('.thumbnail a').trigger("click")
 
     expect(page).to have_selector '.breadcrumb a', text: "Home"
   end
 
   scenario "should add context breadcrumb back to the feature page when navigating to an item from a feature page", :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"]
-    # create page
-    visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
-    click_link exhibit_curator.email
-    within '#user-util-collapse .dropdown' do
-      click_link 'Dashboard'
-    end
-    click_link "Feature pages"
-    
-    add_new_page_via_button
-    
-    expect(page).to have_content("The feature page was created.")
-    within("li.dd-item") do
-      click_link "Edit"
-    end
-    # fill in title
-    fill_in "feature_page_title", :with => "Exhibit Title"
-    # click to add widget
-    add_widget 'item-text'
-    
-    fill_in_typeahead_field "item-text-id", with: "dq287tq6352"
+    feature_page.content = [
+        {
+          type: "solr_documents", 
+          data: { 
+            item: {
+              dq287tq6352: {
+                id: "dq287tq6352", 
+                display: "true"
+              }
+            }
+          }
+        }].to_json
+    feature_page.save
 
-    save_page
+    visit spotlight.exhibit_feature_page_path(exhibit, feature_page)
 
     # verify that the item + image widget is displaying an image from the document.
-    within(:css, ".item-text") do
+    within(:css, ".items-block") do
       expect(page).to have_css(".thumbnail")
       expect(page).to have_css(".thumbnail a img")
       expect(page).not_to have_css(".title")
     end
-
-    find('.thumbnail a').click
+    
+    find('.thumbnail a').trigger("click")
 
     expect(page).to have_selector '.breadcrumb a', text: "Home"
-    expect(page).to have_link "Exhibit Title", href: spotlight.exhibit_feature_page_path(exhibit, Spotlight::FeaturePage.last)
+    expect(page).to have_link "FeaturePage1", href: spotlight.exhibit_feature_page_path(exhibit, feature_page)
   end
 
   scenario "should add context breadcrumbs back to the browse page when navigating to an item from a browse page", :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"]
     search = Spotlight::Search.create! exhibit_id: exhibit.id, title: "Some Saved Search", on_landing_page: true
     visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
     click_link "Browse"