blacklight-spotlight 0.4.1 → 0.5.0

data/spec/features/javascript/edit_in_place_spec.rb

@@ -1,87 +1,61 @@
 require 'spec_helper'
 
 describe 'Edit in place', type: :feature, js: true do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
-  let(:admin)   { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
+  let(:exhibit) { FactoryGirl.create(:default_exhibit) }
+  let(:admin) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
   before { login_as admin }
   describe 'Feature Pages' do
-    it 'should update the label' do
+    it 'updates the label' do
       visit spotlight.exhibit_dashboard_path(exhibit)
 
-      click_link "Feature pages"
+      click_link 'Feature pages'
 
-      add_new_page_via_button("My New Feature Page")
+      add_new_page_via_button('My New Feature Page')
 
-      expect(page).to have_css('h3', text: "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).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")
+        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"
+        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"
+      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")
+      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
+    it 'updates the label' do
       visit spotlight.exhibit_dashboard_path(exhibit)
 
-      within "#sidebar" do
-        click_link "Appearance"
+      within '#sidebar' do
+        click_link 'Appearance'
       end
 
-      click_link "Main menu"
+      click_link 'Main menu'
 
-      within("#nested-navigation") do
-        expect(page).to     have_css("#appearance_main_navigations_1_label[type='hidden']", visible: false)
-        expect(page).not_to have_css("#appearance_main_navigations_1_label[type='text']")
-        click_link("Curated Features")
-        expect(page).not_to have_css("#appearance_main_navigations_1_label[type='hidden']")
-        expect(page).to     have_css("#appearance_main_navigations_1_label[type='text']")
-        fill_in "appearance_main_navigations_1_label", with: "My Page Label"
+      within('#nested-navigation') do
+        expect(page).to have_css("#exhibit_main_navigations_attributes_0_label[type='hidden']", visible: false)
+        expect(page).not_to have_css("#exhibit_main_navigations_attributes_0_label[type='text']")
+        click_link('Curated Features')
+        expect(page).not_to have_css("#exhibit_main_navigations_attributes_0_label[type='hidden']")
+        expect(page).to have_css("#exhibit_main_navigations_attributes_0_label[type='text']")
+        fill_in 'exhibit_main_navigations_attributes_0_label', with: 'My Page Label'
       end
 
-      click_button "Save changes"
+      click_button 'Save changes'
 
-      expect(page).to have_content("The appearance was successfully updated.")
+      expect(page).to have_content('The exhibit was successfully updated.')
 
-      click_link "Main menu"
+      click_link 'Main menu'
 
-      within("#nested-navigation") do
-        expect(page).to have_css('h3', text: "My Page Label")
-      end
-    end
-  end
-  describe 'Sort fields' do
-    it 'should update the label' do
-      visit spotlight.exhibit_edit_sort_fields_path(exhibit)
-
-      within "#sidebar" do
-        click_link "Sort fields"
-      end
-
-      within("#nested-sort-fields") do
-        expect(page).to     have_css("#blacklight_configuration_sort_fields_title_label[type='hidden']", visible: false)
-        expect(page).not_to have_css("#blacklight_configuration_sort_fields_title_label[type='text']")
-        click_link("Title")
-        expect(page).not_to have_css("#blacklight_configuration_sort_fields_title_label[type='hidden']")
-        expect(page).to     have_css("#blacklight_configuration_sort_fields_title_label[type='text']")
-        fill_in "blacklight_configuration_sort_fields_title_label", with: "My Title Label"
-      end
-
-      click_button "Save changes"
-
-      expect(page).to have_content("The exhibit was successfully updated.")
-
-      within("#nested-sort-fields") do
-        expect(page).to have_css('h3', text: "My Title Label")
+      within('#nested-navigation') do
+        expect(page).to have_css('h3', text: 'My Page Label')
       end
     end
   end

data/spec/features/javascript/feature_page_admin_spec.rb

@@ -1,25 +1,25 @@
-require "spec_helper"
+require 'spec_helper'
 
-feature "Feature Pages Adminstration", js:  true do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+feature 'Feature Pages Adminstration', js: true do
+  let(:exhibit) { FactoryGirl.create(:default_exhibit) }
   let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
-  let!(:page1) {
+  let!(:page1) do
     FactoryGirl.create(
       :feature_page,
-      title: "FeaturePage1",
+      title: 'FeaturePage1',
       exhibit: exhibit
     )
-  }
-  let!(:page2) {
+  end
+  let!(:page2) do
     FactoryGirl.create(
       :feature_page,
-      title: "FeaturePage2",
+      title: 'FeaturePage2',
       exhibit: exhibit,
       display_sidebar: true
     )
-  }
+  end
   before { login_as exhibit_curator }
-  it "should be able to create new pages" do
+  it 'is able to create new pages' do
     login_as exhibit_curator
 
     visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
@@ -29,16 +29,16 @@ feature "Feature Pages Adminstration", js:  true do
       click_link 'Dashboard'
     end
 
-    click_link "Feature pages"
+    click_link 'Feature pages'
 
-    add_new_page_via_button("My New Page")
+    add_new_page_via_button('My New Page')
 
-    expect(page).to have_content "The feature page was created."
-    expect(page).to have_css("li.dd-item")
-    expect(page).to have_css("h3", text: "My New Page")
+    expect(page).to have_content 'The feature page was created.'
+    expect(page).to have_css('li.dd-item')
+    expect(page).to have_css('h3', text: 'My New Page')
   end
 
-  it "should update the page titles" do
+  it 'updates the page titles' do
     visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
     click_link exhibit_curator.email
 
@@ -46,91 +46,105 @@ feature "Feature Pages Adminstration", js:  true do
       click_link 'Dashboard'
     end
 
-    click_link "Feature pages"
+    click_link 'Feature pages'
     within("[data-id='#{page1.id}']") do
-      within("h3") do
-        expect(page).to have_content("FeaturePage1")
-        expect(page).to have_css("input", visible: false)
-        click_link("FeaturePage1")
-        expect(page).to have_css("input", visible: true)
-        find("input").set("NewFeaturePage1")
+      within('h3') do
+        expect(page).to have_content('FeaturePage1')
+        expect(page).to have_css('input', visible: false)
+        click_link('FeaturePage1')
+        expect(page).to have_css('input', visible: true)
+        find('input').set('NewFeaturePage1')
       end
     end
-    click_button("Save changes")
+    click_button('Save changes')
     within("[data-id='#{page1.id}']") do
-      within("h3") do
-        expect(page).to have_content("NewFeaturePage1")
+      within('h3') do
+        expect(page).to have_content('NewFeaturePage1')
       end
     end
   end
 
-  it "should stay in curation mode if a user has unsaved data" do
+  it 'stays in curation mode if a user has unsaved data' do
     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"
+    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
+  it 'stays in curation mode if a user has unsaved contenteditable data' do
     visit spotlight.edit_exhibit_feature_page_path(page1.exhibit, page1)
 
     add_widget 'solr_documents'
-    content_editable = find(".st-text-block")
-    content_editable.set("Some Fancy Text.")
+    content_editable = find('.st-text-block')
+    content_editable.set('Some Fancy Text.')
 
-    click_link "Cancel"
-    expect(page).not_to have_selector 'a', text: "Edit"
+    click_link 'Cancel'
+    expect(page).not_to have_selector 'a', text: 'Edit'
   end
 
-  it "should not update the pages list when the user has unsaved changes" do
+  it 'does not update the pages list when the user has unsaved changes' 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"
+    click_link 'Feature pages'
     within("[data-id='#{page1.id}']") do
-      within("h3") do
-        expect(page).to have_content("FeaturePage1")
-        expect(page).to have_css("input", visible: false)
-        click_link("FeaturePage1")
-        expect(page).to have_css("input", visible: true)
-        find("input").set("NewFancyTitle")
+      within('h3') do
+        expect(page).to have_content('FeaturePage1')
+        expect(page).to have_css('input', visible: false)
+        click_link('FeaturePage1')
+        expect(page).to have_css('input', visible: true)
+        find('input').set('NewFancyTitle')
       end
     end
+
     within '#exhibit-navbar' do
-      click_link "Home"
+      click_link 'Home'
+    end
+    expect(page).not_to have_content('Feature pages were successfully updated.')
+    # NOTE: get flash message about unsaved changes
+    expect(page).to have_content('Welcome to your new exhibit')
+
+    # ensure page title not changed
+    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
+      within('h3') do
+        expect(page).to have_content('FeaturePage1') # old title
+      end
     end
-    expect(page).not_to have_content("Feature pages were successfully updated.")
-    expect(page).to have_css("h1 small", text: "Feature Pages")
   end
 
-  it "should be able to update home page titles" do
+  it 'is able to update home page titles' 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"
+    click_link 'Feature pages'
 
-    within(".home_page") do
-      within("h3.panel-title") do
+    within('.home_page') do
+      within('h3.panel-title') do
         expect(page).to have_content(exhibit.home_page.title)
-        expect(page).to have_css("input", visible: false)
+        expect(page).to have_css('input', visible: false)
         click_link(exhibit.home_page.title)
-        expect(page).to have_css("input", visible: true)
-        find("input").set("New Home Page Title")
+        expect(page).to have_css('input', visible: true)
+        find('input').set('New Home Page Title')
       end
     end
-    
-    click_button("Save changes")
-    
-    within(".home_page") do
-      within("h3.panel-title") do
-        expect(page).to have_content("New Home Page Title")
+
+    click_button('Save changes')
+
+    within('.home_page') do
+      within('h3.panel-title') do
+        expect(page).to have_content('New Home Page Title')
       end
     end
   end

data/spec/features/javascript/home_page_edit_spec.rb

@@ -1,14 +1,14 @@
-require "spec_helper"
+require 'spec_helper'
 
-feature "Editing the Home Page", js: true do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+feature 'Editing the Home Page', js: true do
+  let(:exhibit) { FactoryGirl.create(:default_exhibit) }
   let(:admin) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
-  
+
   before { login_as admin }
 
-  it "should not have a search results widget" do
+  it 'does not have a search results widget' do
     visit spotlight.edit_exhibit_home_page_path(exhibit)
-    add_widget
+    click_add_widget
     within("[data-icon='add']") do
       expect(page).not_to have_css("[data-type='search_results']", visible: true)
     end

data/spec/features/javascript/metadata_admin_spec.rb

@@ -1,38 +1,38 @@
-require "spec_helper"
+require 'spec_helper'
 
-feature "Metadata Administration", js: true do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+feature 'Metadata Administration', js: true do
+  let(:exhibit) { FactoryGirl.create(:default_exhibit) }
   let(:admin) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
   before { login_as admin }
-  describe "Select/Deselect all button" do
-    it "should deselect all checkboxes when all are selected" do
-      visit spotlight.exhibit_edit_metadata_path exhibit
+  describe 'Select/Deselect all button' do
+    it 'deselects all checkboxes when all are selected' do
+      visit spotlight.edit_exhibit_metadata_configuration_path exhibit
       # No checkboxes should be unchecked
       expect(page).not_to have_css("tr td:nth-child(2) input[type='checkbox']:not(:checked)")
-      within("tr th:nth-child(2)") do
-        click_button "Deselect all"
-        expect(page).to have_css("button", text: "Select all", visible: true)
+      within('tr th:nth-child(2)') do
+        click_button 'Deselect all'
+        expect(page).to have_css('button', text: 'Select all', visible: true)
       end
       # No checkboxes should be checked
       expect(page).not_to have_css("tr td:nth-child(2) input[type='checkbox']:checked")
     end
-    it "should select all checkboxes when any are unselected" do
-      visit spotlight.exhibit_edit_metadata_path exhibit
+    it 'selects all checkboxes when any are unselected' do
+      visit spotlight.edit_exhibit_metadata_configuration_path exhibit
       # No checkboxes should be unchecked
       expect(page).not_to have_css("tr td:nth-child(2) input[type='checkbox']:not(:checked)")
-      first_button_area = find("tr th:nth-child(2)")
+      first_button_area = find('tr th:nth-child(2)')
       within first_button_area do
-        expect(page).to have_css("button", text: "Deselect all")
+        expect(page).to have_css('button', text: 'Deselect all')
       end
       # Uncheck first checkbox
       find("tr:first-child td:nth-child(2) input[type='checkbox']").set(false)
       # A checkbox should be checked
       expect(page).to have_css("tr td:nth-child(2) input[type='checkbox']:checked")
       within first_button_area do
-        click_button "Select all"
+        click_button 'Select all'
       end
       # No checkboxes should be unchecked
       expect(page).not_to have_css("tr td:nth-child(2) input[type='checkbox']:not(:checked)")
     end
   end
-end
+end

data/spec/features/javascript/multi_image_select_spec.rb

@@ -1,44 +1,43 @@
-require "spec_helper"
+require 'spec_helper'
 
-describe "Multi image selector", type: :feature, js: true do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+describe 'Multi image selector', type: :feature, js: true do
+  let(:exhibit) { FactoryGirl.create(:default_exhibit) }
   let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, 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
-
+  it 'allows the user to select which image in a multi image object to display' do
     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 with: 'xd327cm9378'
+
+    expect(page).to have_selector '.panel'
 
     within('.panel') do
       expect(page).to have_content(/Image \d of \d/)
-      expect(page).to have_link "Change"
+      expect(page).to have_link 'Change'
     end
 
     save_page
-    
+
     visit spotlight.exhibit_feature_page_path(exhibit, feature_page)
 
     expect(page).to have_css("[data-id='xd327cm9378']")
-    expect(page).to     have_css("img[src='https://stacks.stanford.edu/image/xd327cm9378/xd327cm9378_05_0001_thumb']")
+    expect(page).to have_css("img[src='https://stacks.stanford.edu/image/xd327cm9378/xd327cm9378_05_0001_thumb']")
     expect(page).to_not have_css("img[src='https://stacks.stanford.edu/image/xd327cm9378/xd327cm9378_05_0002_thumb']")
 
-    click_link("Edit")
+    click_link('Edit')
 
     within('.panel') do
       expect(page).to have_content(/Image \d of \d/)
-      find('a', text: "Change").trigger('click')
+      find('a', text: 'Change').trigger('click')
     end
 
-    expect(page).to have_css(".thumbs-list ul", visible: true)
+    expect(page).to have_css('.thumbs-list ul', visible: true)
 
-    within(".thumbs-list ul") do
+    within('.thumbs-list ul') do
       all('li')[1].trigger('click')
     end
 
@@ -46,6 +45,6 @@ describe "Multi image selector", type: :feature, js: true do
 
     expect(page).to have_css("[data-id='xd327cm9378']")
     expect(page).to_not have_css("img[src='https://stacks.stanford.edu/image/xd327cm9378/xd327cm9378_05_0001_thumb']")
-    expect(page).to     have_css("img[src='https://stacks.stanford.edu/image/xd327cm9378/xd327cm9378_05_0002_thumb']")
+    expect(page).to have_css("img[src='https://stacks.stanford.edu/image/xd327cm9378/xd327cm9378_05_0002_thumb']")
   end
 end