sufia 4.0.1 → 4.1.0

data/spec/support/cleaner.rb

@@ -0,0 +1,12 @@
+module CleanerHelper
+  # Removes any data in Fedora and Solr
+  def cleanup_jetty
+    ActiveFedora::Base.delete_all
+    Blacklight.solr.delete_by_query("*:*")
+    Blacklight.solr.commit
+  end
+
+  RSpec.configure do |config|
+    config.include CleanerHelper
+  end
+end

data/spec/support/features.rb

@@ -1,6 +1,11 @@
 # spec/support/features.rb
 require File.expand_path('../features/session_helpers', __FILE__)
 require File.expand_path('../fixture_helpers', __FILE__)
+require File.expand_path('../selectors', __FILE__)
+require File.expand_path('../proxies', __FILE__)
+require File.expand_path('../locations', __FILE__)
+require File.expand_path('../poltergeist', __FILE__)
+require File.expand_path('../cleaner', __FILE__)
 
 RSpec.configure do |config|
   config.include Features::SessionHelpers, type: :feature

data/spec/support/features/session_helpers.rb

@@ -1,28 +1,14 @@
 # spec/support/features/session_helpers.rb
 module Features
   module SessionHelpers
-    def sign_up_with(email, password)
-      Capybara.exact = true
-      visit new_user_registration_path
-      fill_in 'Email', with: email
-      fill_in 'Password', with: password
-      fill_in 'Password confirmation', with: password
-      click_button 'Sign up'
-    end
-
     def sign_in(who = :user)
-      user = if who.instance_of?(User)
-        who
-      else
-        FactoryGirl.build(:user).tap do |u|
-          u.save!
-        end
-      end
+      logout
+      user = who.is_a?(User) ? who : FactoryGirl.build(:user).tap { |u| u.save! }
       visit new_user_session_path
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password
       click_button 'Log in'
-      expect(page).to_not have_text 'Invalid email or password.'
+      expect(page).not_to have_text 'Invalid email or password.'
     end
   end
 end

data/spec/support/locations.rb

@@ -0,0 +1,36 @@
+module Locations
+  def go_to_dashboard
+    visit '/dashboard'
+    # causes selenium to wait until text appears on the page
+    expect(page).to have_content('My Dashboard')
+  end
+
+  def go_to_dashboard_files
+    visit '/dashboard/files'
+    expect(page).to have_selector('li.active', text: "My Files")
+  end
+
+  def go_to_dashboard_collections
+    visit '/dashboard/collections'
+    expect(page).to have_content('My Collections')
+  end
+
+  def go_to_dashboard_shares
+    visit '/dashboard/shares'
+    expect(page).to have_content('Files Shared with Me')
+  end
+
+  def go_to_dashboard_highlights
+    visit '/dashboard/highlights'
+    expect(page).to have_content('My Highlights')
+  end
+
+  def go_to_user_profile
+    first(".dropdown-toggle").click
+    click_link "my profile"
+  end
+end
+
+RSpec.configure do |config|
+  config.include Locations
+end

data/spec/support/poltergeist.rb

@@ -0,0 +1,11 @@
+# This file causes capybara to use the phantomjs browser, which is fully
+# compatible with ajax
+require 'capybara/poltergeist'
+
+# Register driver and tell it not to print javascript
+Capybara.register_driver :poltergeist do |app|
+  Capybara::Poltergeist::Driver.new(app, js_errors: true, timeout: 90)
+end
+
+Capybara.default_driver = :poltergeist
+Capybara.javascript_driver = :poltergeist

data/spec/support/proxies.rb

@@ -0,0 +1,14 @@
+module ProxiesHelper
+  def create_proxy_using_partial(*users)
+    users.each do |user|
+      first('a.select2-choice').click
+      find(".select2-input").set(user.user_key)
+      expect(page).to have_css("div.select2-result-label")
+      first("div.select2-result-label").click
+    end
+  end
+
+  RSpec.configure do |config|
+    config.include ProxiesHelper
+  end
+end

data/spec/support/selectors.rb

@@ -0,0 +1,122 @@
+module Selectors
+
+  module Header
+
+    def user_notifications_link
+      within '#user_utility_links' do
+        find '#notify_link'
+      end
+    end
+
+    def user_utility_toggle
+      within '#user_utility_links' do
+        find '.dropdown-toggle.btn.btn-default'
+      end
+    end
+  end
+
+  module Dashboard
+
+    def db_item_actions_toggle item
+      within "#document_#{item.noid}" do
+        find '.dropdown-toggle'
+      end
+    end
+
+    def db_item_title item
+      within "#document_#{item.noid}" do
+        find "#src_copy_link#{item.noid}"
+      end
+    end
+
+    def db_file_checkbox file
+      within "#document_#{file.noid}" do
+        find '.batch_document_selector'
+      end
+    end
+
+    def db_collection_radio_button collection
+      within '#collection-list-container' do
+        find "input[id*='#{collection.noid}']"
+      end
+    end
+
+    def db_create_empty_collection_button
+      first '#hydra-collection-add'
+    end
+
+    def db_create_populated_collection_button
+      within '#collection-list-container' do
+        first '#hydra-collection-add'
+      end
+    end
+
+    def db_visibility_link file
+      within "#document_#{file.noid}" do
+        find "a#permission_#{file.noid}"
+      end
+    end
+
+    def db_facet_category_toggle id
+      find("a[data-target='#{id}']")
+    end
+  end
+
+  module EditCollections
+
+    def ec_update_submit
+      within '.col-xs-12.col-sm-10' do
+        within '.primary-actions' do
+          find_button 'Update Collection'
+        end
+      end
+    end
+
+  end
+
+  module NewTransfers
+
+    def new_owner_dropdown
+      find '#s2id_proxy_deposit_request_transfer_to'
+    end
+
+    def new_owner_search_field
+      within '#select2-drop' do
+        find '.select2-input'
+      end
+    end
+
+    def new_owner_search_result
+      within '#select2-drop' do
+        find '.select2-result-selectable'
+      end
+    end
+
+    def submit_button
+      within '#new_transfer' do
+        find 'input[type=submit]'
+      end
+    end
+  end
+
+  module Transfers
+
+    def first_sent_cancel_button
+      within '#outgoing-transfers' do
+        find '.btn.btn-danger'
+      end
+    end
+
+    def first_received_accept_dropdown
+      within '#incoming-transfers' do
+        find '.dropdown-toggle.accept'
+      end
+    end
+
+    def first_received_reject_button
+      within '#incoming-transfers' do
+        find '.btn.btn-danger'
+      end
+    end
+  end
+end

data/spec/views/batch/edit.html.erb_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'batch/edit.html.erb' do
+describe 'batch/edit.html.erb', :type => :view do
   let( :batch ) {
     stub_model(Batch, id: '123')
   }

data/spec/views/batch_edits/check_all_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Check All' do
+describe 'Check All', :type => :view do
   before (:all) do
     @document_list = ['a','b','c']
     @batch_size_on_other_page = 0
@@ -11,14 +11,14 @@ describe 'Check All' do
     allow(controller).to receive(:controller_name).and_return('batch_edits')
     controller.prepend_view_path "app/views/batch_edits"
     html = render partial: 'batch_edits/check_all'
-    html.should have_selector("li[data-behavior='batch-edit-select-abc']")
+    expect(html).to have_selector("li[data-behavior='batch-edit-select-abc']")
   end
 
   it 'should render actions for my items' do
     allow(controller).to receive(:controller_name).and_return('my')
     controller.prepend_view_path "app/views/my"
     html = render partial: 'batch_edits/check_all'
-    html.should have_selector("li[data-behavior='batch-edit-select-none']")
-    html.should have_selector("li[data-behavior='batch-edit-select-page']")
+    expect(html).to have_selector("li[data-behavior='batch-edit-select-none']")
+    expect(html).to have_selector("li[data-behavior='batch-edit-select-page']")
   end
 end

data/spec/views/catalog/index.html.erb_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'catalog/index.html.erb' do
+describe 'catalog/index.html.erb', :type => :view do
   before do
     allow(view).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)
     stub_template 'catalog/_search_sidebar.html.erb' => ''

data/spec/views/catalog/sort_and_per_page.html.erb_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'catalog/_sort_and_per_page.html.erb' do
+describe 'catalog/_sort_and_per_page.html.erb', :type => :view do
   before do
     allow(controller).to receive(:current_user).and_return(stub_model(User))
     allow_any_instance_of(Ability).to receive(:can?).and_return(true)

data/spec/views/collections/_form.html.erb_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'collections/_form.html.erb' do
+describe 'collections/_form.html.erb', :type => :view do
   describe 'when the collection edit form is rendered' do
     let(:collection) { Collection.new({title: 'the title', description: 'the description',
                                        creator: 'the creator'})}
@@ -14,7 +14,9 @@ describe 'collections/_form.html.erb' do
     it "should draw the metadata fields for collection" do
       render
       expect(rendered).to have_selector("input#collection_title", count: 1)
+      expect(rendered).to_not have_selector("div#additional_title_clone button.adder")
       expect(rendered).to have_selector("input#collection_creator", count: 1)
+      expect(rendered).to have_selector("div#additional_creator_clone button.adder")
       expect(rendered).to have_selector("textarea#collection_description", count: 1)
       expect(rendered).to have_selector("input#collection_contributor", count: 1)
       expect(rendered).to have_selector("input#collection_tag", count: 1)

data/spec/views/collections/_show_descriptions.html.erb_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'collections/_show_descriptions.html.erb' do
+describe 'collections/_show_descriptions.html.erb', :type => :view do
   context 'displaying a custom collection' do
     before do
       @collection = mock_model(Collection)

data/spec/views/dashboard/index_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "dashboard/index.html.erb" do
+describe "dashboard/index.html.erb", :type => :view do
 
   before do
     @user = mock_model(User, name: "Charles Francis Xavier", user_key: "charles")
@@ -8,8 +8,10 @@ describe "dashboard/index.html.erb" do
     allow(@user).to receive(:department).and_return("Xavier’s School for Gifted Youngsters")
     allow(@user).to receive(:telephone).and_return("814.865.8399")
     allow(@user).to receive(:email).and_return("chuck@xsgy.edu")
+    allow(@user).to receive(:login).and_return("chuck")
     allow(@user).to receive(:all_following).and_return(["magneto"])
     allow(@user).to receive(:followers).and_return(["wolverine","storm"])
+    allow(@user).to receive(:can_receive_deposits_from).and_return([])
     allow(controller).to receive(:current_user).and_return(@user)
     allow(view).to receive(:number_of_files).and_return("15")
     allow(view).to receive(:number_of_collections).and_return("3")
@@ -110,11 +112,9 @@ describe "dashboard/index.html.erb" do
         expect(rendered).to include "Single File 1"
       end
 
-
     end
 
     context "without activities and notifications" do
-
       it "should include headings for activities and notifications" do
         render
         expect(rendered).to include "User Activity"
@@ -126,9 +126,6 @@ describe "dashboard/index.html.erb" do
         expect(rendered).to include "User has no notifications"
         expect(rendered).to include "User has no recent activity"
       end
-
     end
-
   end
-
 end

data/spec/views/generic_file/edit.html.erb_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'generic_files/edit.html.erb' do
+describe 'generic_files/edit.html.erb', :type => :view do
   describe 'when the file has two or more resource types' do
     let(:generic_file) {
       content = double('content', versions: [], mimeType: 'application/pdf')

data/spec/views/generic_file/show.html.erb_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'generic_files/show.html.erb' do
+describe 'generic_files/show.html.erb', :type => :view do
   let(:depositor) {
     stub_model(User,
       user_key: 'bob',

data/spec/views/generic_file/stats.html.erb_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'generic_files/stats.html.erb' do
+describe 'generic_files/stats.html.erb', :type => :view do
   describe 'usage statistics' do
     let(:generic_file) {
       stub_model(GenericFile, noid: '123',

data/spec/views/my/facet.html.erb_spec.rb

@@ -3,12 +3,12 @@ require 'spec_helper'
 # Note: this is a direct copy of the corresponding test in Blacklight
 # with changes for "views/my" instead of "views/catalog"
 
-describe "my/facet.html.erb" do
+describe "my/facet.html.erb", :type => :view do
   let(:display_facet) { double }
   let(:blacklight_config) { Blacklight::Configuration.new }
   before do
     blacklight_config.add_facet_field "xyz", label: "Facet title"
-    view.stub(:blacklight_config).and_return(blacklight_config)
+    allow(view).to receive(:blacklight_config).and_return(blacklight_config)
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
     stub_template "my/_facet_pagination.html.erb" => "pagination"
     assign :facet, blacklight_config.facet_fields["xyz"]

data/spec/views/users/_follower_modal.html.erb_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'users/_follower_modal.html.erb' do
+describe 'users/_follower_modal.html.erb', :type => :view do
   let(:user) { FactoryGirl.create(:user, display_name: "Frank") }
 
   before do

data/spec/views/users/_following_modal.html.erb_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'users/_following_modal.html.erb' do
+describe 'users/_following_modal.html.erb', :type => :view do
   let(:user) { FactoryGirl.create(:user, display_name: "Frank") }
 
   before do

data/spec/views/users/_notify_number.html.erb_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'users/_notify_number.html.erb' do
+describe 'users/_notify_number.html.erb', :type => :view do
 
   it "should draw user list" do
     assign :notify_number, 8

data/spec/views/users/_user_util_links.html.erb_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe '/_user_util_links.html.erb' do
+describe '/_user_util_links.html.erb', :type => :view do
 
   let(:join_date) { 5.days.ago }
   before do

data/spec/views/users/index.html.erb_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe 'users/index.html.erb' do
+describe 'users/index.html.erb', :type => :view do
 
   let(:join_date) { 5.days.ago }
   before do
     users = []
     (1..25).each  {|i| users << stub_model(User, name: "name#{i}", user_key: "user#{i}", created_at: join_date)}
-    User.stub_chain(:all).and_return(users)
+    allow(User).to receive_message_chain(:all).and_return(users)
     relation = User.all
     allow(relation).to receive(:limit_value).and_return(10)
     allow(relation).to receive(:current_page).and_return(1)