blacklight-spotlight 1.0.0 → 1.1.0

data/spec/features/exhibits/custom_metadata_fields_spec.rb

@@ -1,7 +1,7 @@
 
 describe 'Adding custom metadata fields', type: :feature do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
-  let(:admin) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:admin) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
 
   before do
     login_as(admin)

data/spec/features/exhibits/edit_metadata_fields_spec.rb

@@ -1,7 +1,7 @@
 
 describe 'Editing metadata fields', type: :feature do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
-  let(:admin) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:admin) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
   before { login_as(admin) }
 
   it 'works' do

data/spec/features/exhibits_index_spec.rb

@@ -1,7 +1,7 @@
 describe 'Exhibits index page', type: :feature do
   context 'with multiple exhibits' do
-    let!(:exhibit) { FactoryGirl.create(:exhibit, title: 'Some Exhibit Title') }
-    let!(:other_exhibit) { FactoryGirl.create(:exhibit, title: 'Some Other Title') }
+    let!(:exhibit) { FactoryBot.create(:exhibit, title: 'Some Exhibit Title') }
+    let!(:other_exhibit) { FactoryBot.create(:exhibit, title: 'Some Other Title') }
 
     it 'shows some cards for each published exhibit' do
       visit spotlight.exhibits_path
@@ -44,7 +44,7 @@ describe 'Exhibits index page', type: :feature do
   end
 
   context 'with a single exhibit' do
-    let!(:exhibit) { FactoryGirl.create(:exhibit, title: 'Some Exhibit Title') }
+    let!(:exhibit) { FactoryBot.create(:exhibit, title: 'Some Exhibit Title') }
 
     it 'redirects to the exhibit home page' do
       visit spotlight.exhibits_path

data/spec/features/feature_page_spec.rb

@@ -1,10 +1,10 @@
-describe 'Feature page', type: :feature do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
-  let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+describe 'Feature page', type: :feature, versioning: true do
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:exhibit_curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
 
   describe 'viewing the page' do
     let!(:feature_page) do
-      FactoryGirl.create(:feature_page, title: 'Parent Page', exhibit: exhibit)
+      FactoryBot.create(:feature_page, title: 'Parent Page', exhibit: exhibit)
     end
     it 'has <meta> tags' do
       TopHat.current['twitter_card'] = nil
@@ -21,10 +21,10 @@ describe 'Feature page', type: :feature do
 
   describe 'sidebar' do
     let!(:parent_feature_page) do
-      FactoryGirl.create(:feature_page, title: 'Parent Page', exhibit: exhibit)
+      FactoryBot.create(:feature_page, title: 'Parent Page', exhibit: exhibit)
     end
     let!(:child_feature_page) do
-      FactoryGirl.create(
+      FactoryBot.create(
         :feature_page,
         title: 'Child Page',
         parent_page: parent_feature_page, exhibit: exhibit
@@ -71,7 +71,7 @@ describe 'Feature page', type: :feature do
   describe 'page options' do
     before { login_as exhibit_curator }
     describe 'publish' do
-      let!(:unpublished_page) { FactoryGirl.create(:feature_page, published: false, exhibit: exhibit) }
+      let!(:unpublished_page) { FactoryBot.create(:feature_page, published: false, exhibit: exhibit) }
       it 'is updatable from the edit page' do
         expect(unpublished_page).not_to be_published
 
@@ -88,7 +88,7 @@ describe 'Feature page', type: :feature do
       end
     end
     describe 'display_sidebar' do
-      let!(:feature_page) { FactoryGirl.create(:feature_page, display_sidebar: false, exhibit: exhibit) }
+      let!(:feature_page) { FactoryBot.create(:feature_page, display_sidebar: false, exhibit: exhibit) }
       before { feature_page.update display_sidebar: false }
       it 'is updatable from the edit page' do
         expect(feature_page.display_sidebar?).to be_falsey
@@ -109,7 +109,7 @@ describe 'Feature page', type: :feature do
 
   describe 'page locking' do
     before { login_as exhibit_curator }
-    let!(:feature_page) { FactoryGirl.create(:feature_page, display_sidebar: false, exhibit: exhibit) }
+    let!(:feature_page) { FactoryBot.create(:feature_page, display_sidebar: false, exhibit: exhibit) }
 
     it 'shows a lock message if someone is currently editing the page' do
       # open the edit page

data/spec/features/home_page_spec.rb

@@ -1,6 +1,6 @@
-describe 'Home page', type: :feature do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
-  let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+describe 'Home page', type: :feature, versioning: true do
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:exhibit_curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
   before { login_as exhibit_curator }
   it 'exists by default on exhibits' do
     visit spotlight.exhibit_dashboard_path(exhibit)
@@ -58,7 +58,7 @@ describe 'Home page', type: :feature do
 
   describe 'page options on edit form' do
     describe 'show title' do
-      let(:home_page) { FactoryGirl.create(:home_page, display_title: false, exhibit: exhibit) }
+      let(:home_page) { FactoryBot.create(:home_page, display_title: false, exhibit: exhibit) }
       it 'is updatable from the edit page' do
         expect(home_page.display_title).to be_falsey
 

data/spec/features/import_exhibit_spec.rb

@@ -1,8 +1,8 @@
 require 'tempfile'
 
 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) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:user) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
   before { login_as user }
 
   pending 'should allow admins to export content from an exhibit' do

data/spec/features/item_admin_spec.rb

@@ -1,6 +1,6 @@
 describe 'Item Administration', type: :feature do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
-  let(:curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
   before { login_as curator }
 
   before do

data/spec/features/javascript/about_page_admin_spec.rb

@@ -1,6 +1,6 @@
 feature 'About Pages Adminstration', js: true do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
-  let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:exhibit_curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
   before { login_as exhibit_curator }
 
   it 'is able to create new pages' do

data/spec/features/javascript/block_controls_spec.rb

@@ -1,6 +1,6 @@
 feature 'Block controls' do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
-  let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:exhibit_curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
   before { login_as exhibit_curator }
 
   scenario 'should be split into separate sections', js: true do

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

@@ -1,11 +1,11 @@
 
 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(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:exhibit_curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
 
-  let!(:feature_page) { FactoryGirl.create(:feature_page, exhibit: exhibit) }
-  let!(:search1) { FactoryGirl.create(:published_search, exhibit: exhibit, title: 'Title1', published: true) }
-  let!(:search2) { FactoryGirl.create(:published_search, exhibit: exhibit, title: 'Title2', published: true) }
+  let!(:feature_page) { FactoryBot.create(:feature_page, exhibit: exhibit) }
+  let!(:search1) { FactoryBot.create(:published_search, exhibit: exhibit, title: 'Title1', published: true) }
+  let!(:search2) { FactoryBot.create(:published_search, exhibit: exhibit, title: 'Title2', published: true) }
 
   before do
     login_as exhibit_curator

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

@@ -1,8 +1,8 @@
 
 describe 'Featured Pages Blocks', type: :feature, js: true do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
   let!(:feature_page1) do
-    FactoryGirl.create(
+    FactoryBot.create(
       :feature_page,
       title: 'FeaturePage1 Title',
       weight: 1,
@@ -10,7 +10,7 @@ describe 'Featured Pages Blocks', type: :feature, js: true do
     )
   end
   let!(:feature_page2) do
-    FactoryGirl.create(
+    FactoryBot.create(
       :feature_page,
       title: 'FeaturePage2 Title',
       weight: 0,
@@ -18,7 +18,7 @@ describe 'Featured Pages Blocks', type: :feature, js: true do
     )
   end
 
-  let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+  let(:exhibit_curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
 
   before do
     login_as exhibit_curator

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

@@ -0,0 +1,44 @@
+describe 'Link to Search Block', type: :feature, js: true do
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:exhibit_curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
+
+  let!(:feature_page) { FactoryBot.create(:feature_page, exhibit: exhibit) }
+  let!(:search1) { FactoryBot.create(:published_search, exhibit: exhibit, title: 'Title1', published: true) }
+  let!(:search2) { FactoryBot.create(:published_search, exhibit: exhibit, title: 'Title2', published: true) }
+
+  before do
+    login_as exhibit_curator
+
+    visit spotlight.edit_exhibit_feature_page_path(exhibit, feature_page)
+    add_widget 'link_to_search'
+  end
+
+  pending 'allows a curator to select from existing browse categories' do
+    pending('Prefetched autocomplete does not work the same way as solr-backed autocompletes')
+    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
+
+  pending 'allows the curator to omit document counts' do
+    pending('Prefetched autocomplete does not work the same way as solr-backed autocompletes')
+    uncheck 'Include item counts?'
+    fill_in_typeahead_field with: 'Title1'
+    save_page
+
+    expect(page).not_to have_css('.item-count', text: /\d+ items/i)
+  end
+end

data/spec/features/javascript/{rule_block_spec.rb → blocks/rule_block_spec.rb}

@@ -1,7 +1,7 @@
-describe 'Horizontal rule 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) }
+describe 'Horizontal rule block', type: :feature, js: true, versioning: true do
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:exhibit_curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
+  let!(:feature_page) { FactoryBot.create(:feature_page, exhibit: exhibit) }
   before { login_as exhibit_curator }
 
   it 'allows the user to select which image in a multi image object to display' do

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

@@ -1,10 +1,10 @@
 
 describe 'Search Result Block', type: :feature, js: true do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
-  let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:exhibit_curator) { FactoryBot.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) }
+  let!(:feature_page) { FactoryBot.create(:feature_page, exhibit: exhibit) }
+  let!(:alt_search) { FactoryBot.create(:search, title: 'Alt. Search', exhibit: exhibit) }
 
   before do
     login_as exhibit_curator

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

@@ -1,9 +1,8 @@
-
-feature 'Solr Document Block', feature: true do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
-  let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+feature 'Solr Document Block', feature: true, versioning: true do
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:exhibit_curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
   let(:feature_page) do
-    FactoryGirl.create(
+    FactoryBot.create(
       :feature_page,
       title: 'FeaturePage1',
       exhibit: exhibit
@@ -58,7 +57,7 @@ feature 'Solr Document Block', feature: true do
 
     # Select the last image
     click_link('Change')
-    all('.thumbs-list li').last.click
+    find('.thumbs-list li:last-child').click
 
     save_page
 

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

@@ -1,7 +1,6 @@
-
-feature 'Uploaded Items Block', feature: true, js: true do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
-  let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+feature 'Uploaded Items Block', feature: true, js: true, versioning: true do
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:exhibit_curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
   let(:fixture_file1) { File.join(FIXTURES_PATH, '800x600.png') }
   let(:fixture_file2) { File.join(FIXTURES_PATH, 'avatar.png') }
 

data/spec/features/javascript/edit_in_place_spec.rb

@@ -1,6 +1,6 @@
 describe 'Edit in place', type: :feature, js: true do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
-  let(:admin) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:admin) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
   before { login_as admin }
   describe 'Feature Pages' do
     it 'updates the label' do

data/spec/features/javascript/feature_page_admin_spec.rb

@@ -1,15 +1,15 @@
 feature 'Feature Pages Adminstration', js: true do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
-  let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:exhibit_curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
   let!(:page1) do
-    FactoryGirl.create(
+    FactoryBot.create(
       :feature_page,
       title: 'FeaturePage1',
       exhibit: exhibit
     )
   end
   let!(:page2) do
-    FactoryGirl.create(
+    FactoryBot.create(
       :feature_page,
       title: 'FeaturePage2',
       exhibit: exhibit,
@@ -53,21 +53,34 @@ feature 'Feature Pages Adminstration', js: true do
   end
 
   it 'stays in curation mode if a user has unsaved data' do
+    pending('Spec does not work with chromedriver')
     visit spotlight.edit_exhibit_feature_page_path(page1.exhibit, page1)
 
+    # Hack to bypass alert about unsaved changes
+    page.evaluate_script('function observedFormsStatusHasChanged() { return false; }')
+
     fill_in('Title', with: 'Some Fancy Title')
-    click_link 'Cancel'
+
+    page.accept_confirm do
+      click_link 'Cancel'
+    end
     expect(page).not_to have_selector 'a', text: 'Edit'
   end
 
   it 'stays in curation mode if a user has unsaved contenteditable data' do
+    pending('Spec does not work with chromedriver')
     visit spotlight.edit_exhibit_feature_page_path(page1.exhibit, page1)
 
+    # Hack to bypass alert about unsaved changes
+    page.evaluate_script('function observedFormsStatusHasChanged() { return false; }')
+
     add_widget 'solr_documents'
     content_editable = find('.st-text-block')
     content_editable.set('Some Fancy Text.')
 
-    click_link 'Cancel'
+    page.accept_confirm do
+      click_link 'Cancel'
+    end
     expect(page).not_to have_selector 'a', text: 'Edit'
   end
 
@@ -75,6 +88,10 @@ feature 'Feature Pages Adminstration', js: true do
     visit spotlight.exhibit_dashboard_path(exhibit)
 
     click_link 'Feature pages'
+
+    # Hack to bypass alert about unsaved changes
+    page.evaluate_script('function observedFormsStatusHasChanged() { return false; }')
+
     within("[data-id='#{page1.id}']") do
       within('h3') do
         expect(page).to have_content('FeaturePage1')
@@ -86,7 +103,9 @@ feature 'Feature Pages Adminstration', js: true do
     end
 
     within '#exhibit-navbar' do
-      click_link 'Home'
+      page.accept_alert do
+        click_link 'Home'
+      end
     end
     expect(page).not_to have_content('Feature pages were successfully updated.')
     # NOTE: get flash message about unsaved changes

data/spec/features/javascript/home_page_edit_spec.rb

@@ -1,6 +1,6 @@
-feature 'Editing the Home Page', js: true do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
-  let(:admin) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
+feature 'Editing the Home Page', js: true, versioning: true do
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:admin) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
 
   before { login_as admin }
 

data/spec/features/javascript/metadata_admin_spec.rb

@@ -1,6 +1,6 @@
 feature 'Metadata Administration', js: true do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
-  let(:admin) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:admin) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
   before { login_as admin }
   describe 'Select/Deselect all button' do
     it 'deselects all checkboxes when all are selected' do

data/spec/features/javascript/multi_image_select_spec.rb

@@ -1,7 +1,7 @@
-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) }
+describe 'Multi image selector', type: :feature, js: true, versioning: true do
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:exhibit_curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
+  let(:feature_page) { FactoryBot.create(:feature_page, exhibit: exhibit) }
   before { login_as exhibit_curator }
 
   it 'allows the user to select which image in a multi image object to display' do
@@ -29,13 +29,13 @@ describe 'Multi image selector', type: :feature, js: true do
 
     within('.panel') do
       expect(page).to have_content(/Image \d of \d/)
-      find('a', text: 'Change').trigger('click')
+      find('a', text: 'Change').click
     end
 
     expect(page).to have_css('.thumbs-list ul', visible: true)
 
     within('.thumbs-list ul') do
-      all('li')[1].trigger('click')
+      all('li')[1].click
     end
 
     save_page