sufia 7.2.0 → 7.3.0.rc1

data/spec/controllers/sufia/homepage_controller_spec.rb

@@ -126,5 +126,19 @@ describe Sufia::HomepageController, type: :controller do
         expect(announcement.name).to eq 'announcement_text'
       end
     end
+
+    context "without solr" do
+      before do
+        allow(controller).to receive(:repository).and_return(instance_double(Blacklight::Solr::Repository))
+        allow(controller.repository).to receive(:search).and_raise Blacklight::Exceptions::ECONNREFUSED
+      end
+
+      it "errors gracefully" do
+        get :index
+        expect(response).to be_success
+        expect(assigns(:admin_sets)).to be_blank
+        expect(assigns(:recent_documents)).to be_blank
+      end
+    end
   end
 end

data/spec/controllers/sufia/trophies_controller_spec.rb

@@ -2,24 +2,37 @@ RSpec.describe Sufia::TrophiesController do
   describe "#toggle_trophy" do
     let(:user) { create(:user) }
     let(:work) { create(:work, user: user) }
-    let(:work_id) { work.id }
 
     context "for a work we have edit access on" do
       before do
         sign_in user
       end
       it "creates a trophy for a work" do
-        post :toggle_trophy, params: { id: work_id }
+        post :toggle_trophy, params: { id: work.id }
         expect(response).to be_success
         json = JSON.parse(response.body)
         expect(json['user_id']).to eq user.id
-        expect(json['work_id']).to eq work_id
+        expect(json['work_id']).to eq work.id
+      end
+      context 'where the trophy already exists' do
+        before do
+          user.trophies.create(work_id: work.id)
+        end
+        it 'destroys the trophy' do
+          expect { post :toggle_trophy, params: { id: work.id } }
+            .to change { Trophy.count }.by(-1)
+
+          expect(response).to be_success
+          json = JSON.parse(response.body)
+          expect(json['user_id']).to eq user.id
+          expect(json['work_id']).to eq work.id
+        end
       end
     end
 
     context "for a work that we don't have edit access on" do
       it "does not create a trophy" do
-        post :toggle_trophy, params: { id: work_id }
+        post :toggle_trophy, params: { id: work.id }
         expect(response).not_to be_success
       end
     end

data/spec/controllers/users_controller_spec.rb

@@ -19,17 +19,26 @@ describe UsersController, type: :controller do
       expect(flash[:alert]).to include("User 'johndoe666' does not exist")
     end
   end
+
   describe "#index" do
-    let!(:u1) { FactoryGirl.create(:user) }
-    let!(:u2) { FactoryGirl.create(:user) }
+    let!(:u1) { create(:user) }
+    let!(:u2) { create(:user) }
 
     describe "requesting html" do
-      it "tests users" do
+      before do
+        # These user types are excluded:
+        User.audit_user
+        User.batch_user
+        create(:user, :guest)
+      end
+
+      it "excludes the audit_user and batch_user" do
         get :index
-        expect(assigns[:users]).to include(u1, u2)
+        expect(assigns[:users].to_a).to match_array [user, u1, u2]
         expect(response).to be_successful
       end
     end
+
     describe "requesting json" do
       it "displays users" do
         get :index, params: { format: :json }

data/spec/factories/permission_template_accesses.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :permission_template_access, class: Sufia::PermissionTemplateAccess do
+    permission_template
+  end
+end

data/spec/factories/permission_templates.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :permission_template, class: Sufia::PermissionTemplate do
+    admin_set_id '88888'
+  end
+end

data/spec/factories/sipity_entities.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :sipity_entity, class: Sipity::Entity do
+    proxy_for_global_id 'gid://internal/Mock/1'
+    workflow { workflow_state.workflow }
+    workflow_state
+  end
+end

data/spec/factories/users.rb

@@ -22,6 +22,10 @@ FactoryGirl.define do
       end
     end
   end
+
+  trait :guest do
+    guest true
+  end
 end
 
 class MockFile

data/spec/factories/workflow_states.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :workflow_state, class: Sipity::WorkflowState do
+    workflow
+    name 'initial'
+  end
+end

data/spec/factories/workflows.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :workflow, class: Sipity::Workflow do
+    name 'generic_work'
+  end
+end

data/spec/features/admin_admin_set_spec.rb

@@ -5,7 +5,8 @@ RSpec.describe "The admin sets, through the admin dashboard" do
 
   before do
     create(:admin_set, title: ["A completely unique name"],
-                       description: ["A substantial description"])
+                       description: ["A substantial description"],
+                       edit_users: [user.user_key])
     allow(RoleMapper).to receive(:byname).and_return(user.user_key => ['admin'])
   end
 
@@ -22,9 +23,10 @@ RSpec.describe "The admin sets, through the admin dashboard" do
     expect(page).to have_content "Works in This Set"
 
     click_link "Edit"
-
-    fill_in "Title", with: 'A better unique name'
-    click_button 'Save'
+    within('#description') do
+      fill_in "Title", with: 'A better unique name'
+      click_button 'Save'
+    end
     expect(page).to have_content "A better unique name"
   end
 end

data/spec/features/batch_edit_spec.rb

@@ -120,7 +120,6 @@ describe 'Batch management of works', type: :feature do
 
   def fill_in_field_wait(id)
     within "#form_#{id}" do
-      sleep 0.1 until page.text.include?('Changes Saved')
       expect(page).to have_content 'Changes Saved', wait: Capybara.default_max_wait_time * 4
     end
   end

data/spec/features/collection_spec.rb

@@ -84,6 +84,10 @@ describe 'collection', type: :feature do
       visit '/dashboard/collections'
     end
 
+    it "has creation date for collections" do
+      expect(page).to have_content(collection1.create_date.to_date.to_formatted_s(:standard))
+    end
+
     it "shows a collection with a listing of Descriptive Metadata and catalog-style search results" do
       expect(page).to have_content(collection.title.first)
       within('#document_' + collection.id) do
@@ -145,10 +149,6 @@ describe 'collection', type: :feature do
       visit '/dashboard/collections'
     end
 
-    it "has creation date for collections" do
-      expect(page).to have_content(collection1.create_date.to_date.to_formatted_s(:standard))
-    end
-
     it "allows changing sort order" do
       find(:xpath, "//select[@id='sort']/option[contains(., 'date modified')][contains(@value, 'asc')]") \
         .select_option

data/spec/features/edit_work_spec.rb

@@ -11,6 +11,7 @@ feature 'Editing a work', type: :feature do
 
   context 'when the user changes permissions' do
     it 'confirms copying permissions to files using Sufia layout' do
+      # e.g. /concern/generic_works/jq085k20z/edit
       visit edit_curation_concerns_generic_work_path(work)
       choose('generic_work_visibility_open')
       check('agreement')

data/spec/features/work_show_spec.rb

@@ -41,5 +41,15 @@ describe "display a work as its owner" do
     it "has some social media buttons" do
       expect(page).to have_link '', href: "https://twitter.com/intent/tweet/?text=Magnificent+splendor&url=http%3A%2F%2Fwww.example.com%2Fconcern%2Fgeneric_works%2F#{work.id}"
     end
+
+    it 'exports EndNote' do
+      expect(page).to have_link 'EndNote'
+      click_link 'EndNote'
+      expect(page).to have_content '%0 Generic Work'
+      expect(page).to have_content '%T Magnificent splendor'
+      expect(page).to have_content '%R http://localhost/files/'
+      expect(page).to have_content '%~ Sufia'
+      expect(page).to have_content '%W Institution Name'
+    end
   end
 end

data/spec/forms/sufia/forms/admin_set_form_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 RSpec.describe Sufia::Forms::AdminSetForm do
-  let(:form) { described_class.new(model) }
+  let(:permission_template) { double }
+  let(:form) { described_class.new(model, permission_template) }
 
   describe "[] accessors" do
     let(:model) { AdminSet.new(description: ['one']) }

data/spec/forms/sufia/forms/batch_edit_form_spec.rb

@@ -42,4 +42,34 @@ describe Sufia::Forms::BatchEditForm do
       expect(form.model.related_url).to match_array ["related_url1", "related_url2"]
     end
   end
+
+  describe ".build_permitted_params" do
+    subject { described_class.build_permitted_params }
+    it do
+      is_expected.to eq [{ creator: [] },
+                         { contributor: [] },
+                         { description: [] },
+                         { keyword: [] },
+                         { resource_type: [] },
+                         { rights: [] },
+                         { publisher: [] },
+                         { date_created: [] },
+                         { subject: [] },
+                         { language: [] },
+                         { identifier: [] },
+                         { based_near: [] },
+                         { related_url: [] },
+                         :version,
+                         { permissions_attributes: [:type, :name, :access, :id, :_destroy] },
+                         :on_behalf_of,
+                         { collection_ids: [] },
+                         :visibility_during_embargo,
+                         :embargo_release_date,
+                         :visibility_after_embargo,
+                         :visibility_during_lease,
+                         :lease_expiration_date,
+                         :visibility_after_lease,
+                         :visibility]
+    end
+  end
 end

data/spec/forms/sufia/forms/permission_template_form_spec.rb

@@ -0,0 +1,196 @@
+require 'spec_helper'
+
+RSpec.describe Sufia::Forms::PermissionTemplateForm do
+  describe "#update" do
+    let(:input_params) do
+      ActionController::Parameters.new(access_grants_attributes: grant_attributes).permit!
+    end
+    let(:admin_set) { create(:admin_set) }
+    let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id) }
+    let(:form) { described_class.new(permission_template) }
+    subject { form.update(input_params) }
+    let(:today) { Time.zone.today }
+
+    context "with a user manager" do
+      let(:grant_attributes) do
+        [ActionController::Parameters.new(agent_type: "user",
+                                          agent_id: "bob",
+                                          access: "manage").permit!]
+      end
+      it "also adds edit_access to the AdminSet itself" do
+        expect { subject }.to change { permission_template.access_grants.count }.by(1)
+        expect(admin_set.reload.edit_users).to include 'bob'
+      end
+    end
+
+    context "with a group manager" do
+      let(:grant_attributes) do
+        [ActionController::Parameters.new(agent_type: "group",
+                                          agent_id: "bob",
+                                          access: "manage").permit!]
+      end
+      it "also adds edit_access to the AdminSet itself" do
+        expect { subject }.to change { permission_template.access_grants.count }.by(1)
+        expect(admin_set.reload.edit_groups).to include 'bob'
+      end
+    end
+
+    context "without a manager" do
+      let(:grant_attributes) do
+        [ActionController::Parameters.new(agent_type: "user",
+                                          agent_id: "bob",
+                                          access: "view").permit!]
+      end
+      it "doesn't adds edit_access to the AdminSet itself" do
+        expect { subject }.to change { permission_template.access_grants.count }.by(1)
+        expect(admin_set.reload.edit_users).to be_empty
+      end
+    end
+
+    context "with visibility only" do
+      let(:input_params) do
+        ActionController::Parameters.new(visibility: "open").permit!
+      end
+      it "updates the visibility" do
+        expect { subject }.to change { permission_template.reload.visibility }.from(nil).to('open')
+      end
+    end
+
+    context "with release 'no delay'" do
+      let(:input_params) do
+        ActionController::Parameters.new(release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY).permit!
+      end
+      it "sets release_period=now, release_date=today" do
+        expect { subject }.to change { permission_template.reload.release_period }.from(nil).to(Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY)
+        expect(permission_template.release_date).to eq(today)
+      end
+    end
+
+    context "with release 'varies', date specified" do
+      let(:input_params) do
+        ActionController::Parameters.new(release_period: "", release_varies: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE, release_date: today + 1.year).permit!
+      end
+      it "sets release_period=before and release_date" do
+        expect { subject }.to change { permission_template.reload.release_period }.from(nil).to(Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE)
+        expect(permission_template.release_date).to eq(today + 1.year)
+      end
+    end
+
+    context "with release 'varies', embargo specified" do
+      let(:input_params) do
+        ActionController::Parameters.new(release_period: "", release_varies: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_EMBARGO, release_embargo: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_2_YEARS).permit!
+      end
+      it "sets release_period to embargo period and release_date to 2 years from now" do
+        expect { subject }.to change { permission_template.reload.release_period }.from(nil).to(Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_2_YEARS)
+        expect(permission_template.release_date).to eq(today + 2.years)
+      end
+    end
+
+    context "with release 'fixed', date specified" do
+      let(:input_params) do
+        ActionController::Parameters.new(release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED, release_date: today + 1.month).permit!
+      end
+      it "sets release_period=fixed and release_date" do
+        expect { subject }.to change { permission_template.reload.release_period }.from(nil).to(Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED)
+        expect(permission_template.release_date).to eq(today + 1.month)
+      end
+    end
+
+    context "with modifying release_period from 'fixed' to 'no_delay'" do
+      let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED, release_date: today + 1.month) }
+      let(:input_params) do
+        ActionController::Parameters.new(release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY).permit!
+      end
+      it "sets release_period=now, release_date=today" do
+        expect { subject }.to change { permission_template.reload.release_period }.from(Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED).to(Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY)
+        expect(permission_template.release_date).to eq(today)
+      end
+    end
+
+    context "with modifying release 'varies' from date specified to embargo specified" do
+      let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE, release_date: today + 1.month) }
+      let(:input_params) do
+        ActionController::Parameters.new(release_period: "", release_varies: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_EMBARGO, release_embargo: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_2_YEARS).permit!
+      end
+      it "sets release_period to embargo period, release_date to 2 years from now" do
+        expect { subject }.to change { permission_template.reload.release_period }.from(Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE).to(Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_2_YEARS)
+        expect(permission_template.release_date).to eq(today + 2.years)
+      end
+    end
+  end
+
+  describe "#select_release_varies_option" do
+    let(:admin_set) { create(:admin_set) }
+    let(:form) { described_class.new(permission_template) }
+    subject { form.send(:select_release_varies_option, permission_template) }
+    let(:today) { Time.zone.today }
+
+    context "with release before date specified" do
+      let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE, release_date: today + 1.month) }
+      it "selects release_varies='before'" do
+        expect(form.release_varies).to eq(Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE)
+        expect(form.release_embargo).to be_nil
+      end
+    end
+
+    context "with release embargo specified" do
+      let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_1_YEAR) }
+      it "selects release_varies='embargo' and value in embargo selectbox" do
+        expect(form.release_varies).to eq(Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_EMBARGO)
+        expect(form.release_embargo).to eq(Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_1_YEAR)
+      end
+    end
+
+    context "with release no-delay (now) selected" do
+      let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY) }
+      it "selects neither varies option, nor embargo" do
+        expect(form.release_varies).to be_nil
+        expect(form.release_embargo).to be_nil
+      end
+    end
+  end
+
+  describe "#update_release_attributes" do
+    let(:admin_set) { create(:admin_set) }
+    let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id) }
+    let(:form) { described_class.new(permission_template) }
+    subject { form.send(:update_release_attributes, input_params) }
+    let(:today) { Time.zone.today }
+
+    context "with release varies by date selected" do
+      let(:input_params) do
+        ActionController::Parameters.new(release_period: "", release_varies: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE, release_date: today + 1.month).permit!
+      end
+      it "updates params to release_period=before and keeps date" do
+        expect { subject }.to change { input_params[:release_period] }.from("").to(Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE)
+        expect(input_params[:release_date]).to eq(today + 1.month)
+        expect(input_params[:release_varies]).to be_nil
+        expect(input_params[:release_embargo]).to be_nil
+      end
+    end
+
+    context "with release varies by embargo selected" do
+      let(:input_params) do
+        ActionController::Parameters.new(release_period: "", release_varies: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_EMBARGO, release_embargo: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_1_YEAR).permit!
+      end
+      it "updates params to release_period=1yr" do
+        expect { subject }.to change { input_params[:release_period] }.from("").to(Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_1_YEAR)
+        expect(input_params[:release_date]).to be_nil
+        expect(input_params[:release_varies]).to be_nil
+        expect(input_params[:release_embargo]).to be_nil
+      end
+    end
+
+    context "with release no delay (now) selected, after filling out release_date" do
+      let(:input_params) do
+        ActionController::Parameters.new(release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY, release_varies: "", release_embargo: "", release_date: today + 1.month).permit!
+      end
+      it "updates params to release_period=1yr" do
+        expect { subject }.to change { input_params[:release_date] }.from(today + 1.month).to(nil)
+        expect(input_params[:release_period]).to eq(Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY)
+        expect(input_params[:release_varies]).to be_nil
+        expect(input_params[:release_embargo]).to be_nil
+      end
+    end
+  end
+end