sufia 7.2.0 → 7.3.0.rc1

data/spec/forms/sufia/forms/work_form_spec.rb

@@ -1,4 +1,4 @@
-describe Sufia::Forms::WorkForm do
+describe Sufia::Forms::WorkForm, :no_clean do
   let(:work) { GenericWork.new }
   let(:form) { described_class.new(work, nil) }
   let(:works) { [GenericWork.new, FileSet.new, GenericWork.new] }
@@ -17,4 +17,38 @@ describe Sufia::Forms::WorkForm do
       expect(form.ordered_work_members.size).to eq(2)
     end
   end
+
+  describe "#in_work_members" do
+    it "expects parent work members" do
+      allow(work).to receive(:in_works).and_return(works)
+      expect(form.in_work_members.size).to eq(3)
+    end
+  end
+
+  describe ".build_permitted_params" do
+    before do
+      allow(described_class).to receive(:model_class).and_return(GenericWork)
+    end
+    subject { described_class.build_permitted_params }
+    context "without mediated deposit" do
+      it { is_expected.to include(permissions_attributes: [:type, :name, :access, :id, :_destroy]) }
+    end
+  end
+
+  describe ".model_attributes" do
+    before do
+      allow(described_class).to receive(:model_class).and_return(GenericWork)
+    end
+    subject { described_class.model_attributes(ActionController::Parameters.new(attributes)) }
+
+    context "when a user is granted edit access" do
+      let(:attributes) { { permissions_attributes: [{ type: 'person', name: 'justin', access: 'edit' }] } }
+      it { is_expected.to eq ActionController::Parameters.new(permissions_attributes: [ActionController::Parameters.new(type: 'person', name: 'justin', access: 'edit')]).permit! }
+    end
+
+    context "without permssions being set" do
+      let(:attributes) { {} }
+      it { is_expected.to eq ActionController::Parameters.new.permit! }
+    end
+  end
 end

data/spec/helpers/batch_edits_helper_spec.rb

@@ -6,28 +6,28 @@ describe BatchEditsHelper, type: :helper do
 
     context "with my works" do
       it "shows the check all dropdown" do
-        allow(controller).to receive(:controller_name).and_return("my/works")
+        allow(controller).to receive(:params).and_return(controller: "my/works")
         expect(helper.render_check_all).to have_css("span.glyphicon-cog")
       end
     end
 
     context "with my shares" do
       it "shows the check all dropdown" do
-        allow(controller).to receive(:controller_name).and_return("my/shares")
+        allow(controller).to receive(:params).and_return(controller: "my/shares")
         expect(helper.render_check_all).to have_css("span.glyphicon-cog")
       end
     end
 
     context "with my highlights" do
       it "shows the check all dropdown" do
-        allow(controller).to receive(:controller_name).and_return("my/shares")
+        allow(controller).to receive(:params).and_return(controller: "my/shares")
         expect(helper.render_check_all).to have_css("span.glyphicon-cog")
       end
     end
 
     context "with my collections" do
       it "does not show the check all dropdown" do
-        allow(controller).to receive(:controller_name).and_return("my/collections")
+        allow(controller).to receive(:params).and_return(controller: "my/collections")
         expect(helper.render_check_all).to be_nil
       end
     end

data/spec/helpers/blacklight_helper_spec.rb

@@ -94,7 +94,7 @@ RSpec.describe BlacklightHelper, type: :helper do
 
       context "identifier_tesim" do
         let(:field_name) { 'identifier_tesim' }
-        it { is_expected.to eq '<a href="/catalog?identifier=%2265434567654345654%22&amp;search_field=advanced">65434567654345654</a>' }
+        it { is_expected.to eq '<a href="/catalog?q=%2265434567654345654%22&amp;search_field=identifier">65434567654345654</a>' }
       end
     end
   end

data/spec/helpers/sufia_helper_spec.rb

@@ -51,20 +51,46 @@ describe SufiaHelper, type: :helper do
     end
 
     describe '#index_field_link' do
-      let(:args) { { config: { field_name: 'contributor' }, value: ['Fritz Lang', 'Mel Brooks'] } }
-      it 'requires 1 arg' do
-        expect { helper.index_field_link }.to raise_error ArgumentError
-        expect { helper.index_field_link({}, 'junk') }.to raise_error ArgumentError
+      let(:args) do
+        {
+          config: { field_name: 'contributor' },
+          value: ['Fritz Lang', 'Mel Brooks']
+        }
       end
+
       subject { helper.index_field_link(args) }
-      it 'returns link' do
+
+      it 'returns a link' do
         expect(subject).to be_html_safe
-        expect(subject).to eq '<a href="/catalog?contributor=%22Fritz+Lang%22&amp;search_field=advanced">Fritz Lang</a>, ' \
-                            + '<a href="/catalog?contributor=%22Mel+Brooks%22&amp;search_field=advanced">Mel Brooks</a>'
+        expect(subject).to eq '<a href="/catalog?q=%22Fritz+Lang%22&amp;search_field=contributor">Fritz Lang</a>, ' \
+                            + '<a href="/catalog?q=%22Mel+Brooks%22&amp;search_field=contributor">Mel Brooks</a>'
       end
     end
   end
 
+  describe "#link_to_each_facet_field" do
+    subject { helper.link_to_each_facet_field(options) }
+    context "with helper_facet and default separator" do
+      let(:options) { { config: { helper_facet: Solrizer.solr_name("document_types", :facetable).to_sym }, value: ["Imaging > Object Photography"] } }
+      it { is_expected.to eq("<a href=\"/catalog?f%5Bdocument_types_sim%5D%5B%5D=Imaging\">Imaging</a> &gt; <a href=\"/catalog?f%5Bdocument_types_sim%5D%5B%5D=Object+Photography\">Object Photography</a>") }
+    end
+
+    context "with helper_facet and optional separator" do
+      let(:options) { { config: { helper_facet: Solrizer.solr_name("document_types", :facetable).to_sym, separator: " : " }, value: ["Imaging : Object Photography"] } }
+      it { is_expected.to eq("<a href=\"/catalog?f%5Bdocument_types_sim%5D%5B%5D=Imaging\">Imaging</a> : <a href=\"/catalog?f%5Bdocument_types_sim%5D%5B%5D=Object+Photography\">Object Photography</a>") }
+    end
+
+    context "with :output_separator" do
+      let(:options) { { config: { helper_facet: Solrizer.solr_name("document_types", :facetable).to_sym, output_separator: ' ~ ', separator: ":" }, value: ["Imaging : Object Photography"] } }
+      it { is_expected.to eq("<a href=\"/catalog?f%5Bdocument_types_sim%5D%5B%5D=Imaging\">Imaging</a> ~ <a href=\"/catalog?f%5Bdocument_types_sim%5D%5B%5D=Object+Photography\">Object Photography</a>") }
+    end
+
+    context "with :no_spaces_around_separator" do
+      let(:options) { { config: { helper_facet: Solrizer.solr_name("document_types", :facetable).to_sym, output_separator: '~', separator: ":" }, value: ["Imaging : Object Photography"] } }
+      it { is_expected.to eq("<a href=\"/catalog?f%5Bdocument_types_sim%5D%5B%5D=Imaging\">Imaging</a>~<a href=\"/catalog?f%5Bdocument_types_sim%5D%5B%5D=Object+Photography\">Object Photography</a>") }
+    end
+  end
+
   describe "has_collection_search_parameters?" do
     subject { helper }
     context "when cq is set" do
@@ -253,4 +279,10 @@ describe SufiaHelper, type: :helper do
       expect(helper.human_readable_date(value: ["2016-08-15T00:00:00Z"])).to eq("08/15/2016")
     end
   end
+
+  describe "#banner_image" do
+    it "returns the configured Sufia banner image" do
+      expect(helper.banner_image).to eq(Sufia.config.banner_image)
+    end
+  end
 end

data/spec/indexers/sufia/collection_indexer_spec.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+describe Sufia::CollectionIndexer do
+  let(:collection) { build(:collection, id: "1234") }
+
+  subject { described_class.new(collection).generate_solr_document }
+
+  it "indexes thumbnail" do
+    expect(subject["thumbnail_path_ss"]).to start_with("/assets/collection")
+  end
+end

data/spec/javascripts/autocomplete_spec.js.coffee

@@ -34,7 +34,7 @@ describe "auto complete", ->
         target.trigger(@typeEvent)
 
         # move time along so that events have a chance to happen
-        jasmine.clock().tick(800);
+        jasmine.clock().tick(800)
 
         # verify that the ajax call was made
         expect(@spy_on_json).toHaveBeenCalled()
@@ -50,7 +50,7 @@ describe "auto complete", ->
         target.trigger(@typeEvent)
 
         # move time along so that events have a chance to happen
-        jasmine.clock().tick(800);
+        jasmine.clock().tick(800)
 
         # verify that the ajax call was made
         expect(@spy_on_json).toHaveBeenCalled()
@@ -74,7 +74,7 @@ describe "auto complete", ->
         target.trigger(@typeEvent)
 
         # move time along so that events have a chance to happen
-        jasmine.clock().tick(800);
+        jasmine.clock().tick(800)
 
         # verify that the ajax call was made
         expect(@spy_on_json).toHaveBeenCalled()
@@ -90,7 +90,7 @@ describe "auto complete", ->
         target.trigger(@typeEvent)
 
         # move time along so that events have a chance to happen
-        jasmine.clock().tick(800);
+        jasmine.clock().tick(800)
 
         # verify that the ajax call was made
         expect(@spy_on_json).toHaveBeenCalled()
@@ -115,7 +115,7 @@ describe "auto complete", ->
         target.trigger(@typeEvent)
 
         # move time along so that events have a chance to happen
-        jasmine.clock().tick(800);
+        jasmine.clock().tick(800)
 
         # verify that the ajax call was made
         expect(@spy_on_json).toHaveBeenCalled()
@@ -131,7 +131,47 @@ describe "auto complete", ->
         target.trigger(@typeEvent)
 
         # move time along so that events have a chance to happen
-        jasmine.clock().tick(800);
+        jasmine.clock().tick(800)
+
+        # verify that the ajax call was made
+        expect(@spy_on_json).toHaveBeenCalled()
+
+  describe "works", ->
+    beforeEach ->
+      # setup two inputs for us to attach  auto complete to
+      setFixtures  '<input class="generic_work_work"  value="" id="generic_work_based_near" type="text" data-autocomplete="work" data-autocomplete-url="foo">
+                    <input class="generic_work_work"  value="" type="text" data-autocomplete="work" data-autocomplete-url="foo">'
+
+      # run all Blacklight.onload functions
+      Blacklight.activate()
+
+    describe "first input", ->
+
+      # field triggers auto complete
+      it "auto completes on typing", ->
+        # send a key stroke to the target input to activate the auto complete
+        target = $($("input.generic_work_work")[0])
+        target.val('fre')
+        target.trigger(@typeEvent)
+
+        # move time along so that events have a chance to happen
+        jasmine.clock().tick(800)
+
+        # verify that the ajax call was made
+        expect(@spy_on_json).toHaveBeenCalled()
+
+
+    describe "second input", ->
+
+      # field triggers auto complete
+      it "auto completes on typing", ->
+        # send a key stroke to the target input to activate the auto complete
+        target = $($("input.generic_work_work")[1])
+        target.val('fre')
+        target.trigger(@typeEvent)
+
+        # move time along so that events have a chance to happen
+        jasmine.clock().tick(800)
 
         # verify that the ajax call was made
         expect(@spy_on_json).toHaveBeenCalled()

data/spec/javascripts/visibility_component_spec.js

@@ -0,0 +1,491 @@
+describe("VisibilityComponent", function() {
+  var control = require('sufia/save_work/visibility_component');
+  var target = null;
+  var element = null;
+
+  beforeEach(function() {
+    var fixture = setFixtures(visibilityForm(''));
+    element = fixture.find('.visibility');
+    target = new control.VisibilityComponent(element);
+  });
+
+  //limitByAdminSet() - Also tests restrictToVisibility(selected) which is where much of logic sits
+  describe("limitByAdminSet", function() {
+    describe("with no admin set selected", function() {
+      beforeEach(function() {
+        spyOn(target, 'enableAllOptions');
+      });
+      it("enables all visibility options", function() {
+        target.limitByAdminSet();
+        expect(target.enableAllOptions).toHaveBeenCalled();
+      });
+    });
+    describe("with selected admin set having no restrictions", function() {
+      beforeEach(function() {
+        var fixture = setFixtures(visibilityForm('<option selected="selected">No Restrictions AdminSet</option>'));
+        element = fixture.find('.visibility');
+        target = new control.VisibilityComponent(element);
+        spyOn(target, 'enableAllOptions');
+      });
+      it("enables all visibility options", function() {
+        target.limitByAdminSet();
+        expect(target.enableAllOptions).toHaveBeenCalled();
+      });
+    });
+    describe("with selected admin set having visibility restrictions only", function() {
+      beforeEach(function() {
+        var fixture = setFixtures(visibilityForm('<option data-visibility="authenticated" selected="selected">Institution-Only AdminSet</option>'));
+        element = fixture.find('.visibility');
+        target = new control.VisibilityComponent(element);
+        spyOn(target, 'applyRestrictions');
+      });
+      it("calls applyRestrictions with specified visibility", function() {
+        target.limitByAdminSet();
+        expect(target.applyRestrictions).toHaveBeenCalledWith('authenticated', undefined, undefined);
+      });
+    });
+    describe("with selected admin set having release immediately restrictions (no visibility)", function() {
+      beforeEach(function() {
+        var fixture = setFixtures(visibilityForm('<option data-release-date="' + target.getToday() + '" data-release-before-date="false" selected="selected">Release Immediately AdminSet</option>'));
+        element = fixture.find('.visibility');
+        target = new control.VisibilityComponent(element);
+        spyOn(target, 'applyRestrictions');
+      });
+      it("calls applyRestrictions with specified date requirement", function() {
+        target.limitByAdminSet();
+        expect(target.applyRestrictions).toHaveBeenCalledWith(undefined, target.getToday(), false);
+      });
+    });
+    describe("with selected admin set having release publicly immediately restrictions", function() {
+      beforeEach(function() {
+        var fixture = setFixtures(visibilityForm('<option data-visibility="open" data-release-date="' + target.getToday() + '" data-release-before-date="false" selected="selected">Release Publicly Immediately AdminSet</option>'));
+        element = fixture.find('.visibility');
+        target = new control.VisibilityComponent(element);
+        spyOn(target, 'applyRestrictions');
+      });
+      it("calls applyRestrictions with specified date and visibility requirement", function() {
+        target.limitByAdminSet();
+        expect(target.applyRestrictions).toHaveBeenCalledWith("open", target.getToday(), false);
+      });
+    });
+    describe("with selected admin set having release on future date set", function() {
+      beforeEach(function() {
+        var fixture = setFixtures(visibilityForm('<option data-release-date="' + getOneYearFromToday() + '" data-release-before-date="false" selected="selected">Release in One Year AdminSet</option>'));
+        element = fixture.find('.visibility');
+        target = new control.VisibilityComponent(element);
+        spyOn(target, 'applyRestrictions');
+      });
+      it("calls applyRestrictions with specified date requirement", function() {
+        target.limitByAdminSet();
+        expect(target.applyRestrictions).toHaveBeenCalledWith(undefined, getOneYearFromToday(), false);
+      });
+    });
+    describe("with selected admin set having release to institution before one year set", function() {
+      beforeEach(function() {
+        var fixture = setFixtures(visibilityForm('<option data-visibility="authenticated" data-release-date="' + getOneYearFromToday() + '" data-release-before-date="true" selected="selected">Release in One Year to Institution AdminSet</option>'));
+        element = fixture.find('.visibility');
+        target = new control.VisibilityComponent(element);
+        spyOn(target, 'applyRestrictions');
+      });
+      it("calls applyRestrictions with specified date and visibility requirement", function() {
+        target.limitByAdminSet();
+        expect(target.applyRestrictions).toHaveBeenCalledWith("authenticated", getOneYearFromToday(), true);
+      });
+    });
+  });
+
+  //applyRestrictions(visibility, release_date, release_before)
+  describe("applyRestrictions", function() {
+    describe("with visibility restrictions only (no release date requirements)", function() {
+      beforeEach(function() {
+        spyOn(target, 'enableReleaseNowOrEmbargo');
+      });
+      it("enable that visibility option OR embargo, and limit embargo to any future date", function() {
+        target.applyRestrictions("authenticated", undefined, undefined);
+        expect(target.enableReleaseNowOrEmbargo).toHaveBeenCalledWith("authenticated", undefined, undefined);
+      });
+    });
+    describe("with release date of today (immediately) and no visibility", function() {
+      beforeEach(function() {
+        spyOn(target, 'disableEmbargoAndLease');
+      });
+      it("disables embargo and lease options", function() {
+        target.applyRestrictions(undefined, target.getToday(), false);
+        expect(target.disableEmbargoAndLease).toHaveBeenCalled();
+      });
+    });
+    describe("with release date of today (immediately) and required visibility", function() {
+      beforeEach(function() {
+        spyOn(target, 'selectVisibility');
+      });
+      it("selects that visibility (disabling other options)", function() {
+        target.applyRestrictions("open", target.getToday(), false);
+        expect(target.selectVisibility).toHaveBeenCalledWith("open");
+      });
+    });
+    describe("with required visibility and embargo allowed (release before future date)", function() {
+      beforeEach(function() {
+        spyOn(target, 'enableReleaseNowOrEmbargo');
+      });
+      it("allows any date between now and future date", function() {
+        var futureDate = getOneYearFromToday();
+        target.applyRestrictions("open", futureDate, true);
+        expect(target.enableReleaseNowOrEmbargo).toHaveBeenCalledWith("open", futureDate, true);
+      });
+    });
+    describe("with required future release date, and any visibility allowed", function() {
+      beforeEach(function() {
+        spyOn(target, 'requireEmbargo');
+      });
+      it("require embargo until release_date and don't restrict visibility", function() {
+        var futureDate = getOneYearFromToday();
+        target.applyRestrictions(undefined, futureDate, false);
+        expect(target.requireEmbargo).toHaveBeenCalledWith(undefined, futureDate);
+      });
+    });
+    describe("with required future release date, and required visibility", function() {
+      beforeEach(function() {
+        spyOn(target, 'requireEmbargo');
+      });
+      it("require embargo until release_date and require visibility", function() {
+        var futureDate = getOneYearFromToday();
+        target.applyRestrictions("authenticated", futureDate, false);
+        expect(target.requireEmbargo).toHaveBeenCalledWith("authenticated", futureDate);
+      });
+    });
+  });
+
+  //selectVisibility(visibility)
+  describe("selectVisibility", function() {
+    describe("with 'open' passed in", function() {
+      it("selects the required open visibility, disabling all other options", function() {
+        target.selectVisibility("open");
+        expect(element.find("[type='radio'][value='open']")).toBeChecked();
+        expect(element.find("[type='radio'][value='open']")).not.toBeDisabled();
+        expect(element.find("[type='radio'][value='authenticated']")).toBeDisabled();
+        expect(element.find("[type='radio'][value='embargo']")).toBeDisabled();
+        expect(element.find("[type='radio'][value='restricted']")).toBeDisabled();
+        expect(element.find("[type='radio'][value='lease']")).toBeDisabled();
+      });
+    });
+    describe("with 'restricted' passed in", function() {
+      it("selects the required restricted visibility, disabling all other options", function() {
+        target.selectVisibility("restricted");
+        expect(element.find("[type='radio'][value='open']")).toBeDisabled();
+        expect(element.find("[type='radio'][value='authenticated']")).toBeDisabled();
+        expect(element.find("[type='radio'][value='embargo']")).toBeDisabled();
+        expect(element.find("[type='radio'][value='restricted']")).toBeChecked();
+        expect(element.find("[type='radio'][value='restricted']")).not.toBeDisabled();
+        expect(element.find("[type='radio'][value='lease']")).toBeDisabled();
+      });
+    });
+  });
+
+  //enableReleaseNowOrEmbargo(visibility, release_date, release_before)
+  describe("enableReleaseNowOrEmbargo", function() {
+    describe("with visibility only", function() {
+      it("enable that visibility option OR embargo, restrict release_date to after today, and set visibility after embargo", function() {
+        target.enableReleaseNowOrEmbargo("open", undefined, undefined);
+        expect(element.find("[type='radio'][value='open']")).not.toBeDisabled();
+        expect(element.find("[type='radio'][value='embargo']")).not.toBeDisabled();
+        expect(target.getEmbargoDateInput()).toHaveProp("min", target.getToday());
+        expect(target.getEmbargoDateInput()).not.toBeDisabled();
+        expect(target.getVisibilityAfterEmbargoInput()).toHaveValue("open");
+        expect(target.getVisibilityAfterEmbargoInput()).toBeDisabled();
+      });
+    });
+    describe("with visibility and release_date range", function() {
+      it("enable that visibility OR embargo, restrict release_date to range, and set visibility after embargo", function() {
+        var futureDate = getOneYearFromToday();
+        target.enableReleaseNowOrEmbargo("authenticated", futureDate, true);
+        // enable immediate release or embargo with given visibility
+        expect(element.find("[type='radio'][value='authenticated']")).not.toBeDisabled();
+        expect(element.find("[type='radio'][value='embargo']")).not.toBeDisabled();
+        // restrict embargo date range
+        expect(target.getEmbargoDateInput()).toHaveProp("min", target.getToday());
+        expect(target.getEmbargoDateInput()).toHaveProp("max", futureDate);
+        expect(target.getEmbargoDateInput()).not.toBeDisabled();
+        // require visibility after embargo
+        expect(target.getVisibilityAfterEmbargoInput()).toHaveValue("authenticated");
+        expect(target.getVisibilityAfterEmbargoInput()).toBeDisabled();
+      });
+    });
+  });
+
+  //disableEmbargoAndLease
+  describe("disableEmbargoAndLease", function() {
+    it("Disables embargo and lease options, enabling all others", function() {
+      target.disableEmbargoAndLease();
+      expect(element.find("[type='radio'][value='open']")).not.toBeDisabled();
+      expect(element.find("[type='radio'][value='authenticated']")).not.toBeDisabled();
+      expect(element.find("[type='radio'][value='embargo']")).toBeDisabled();
+      expect(element.find("[type='radio'][value='restricted']")).not.toBeDisabled();
+      expect(element.find("[type='radio'][value='lease']")).toBeDisabled();
+    });
+  });
+
+  //requireEmbargo(visibility, release_date)
+  describe("requireEmbargo", function() {
+    describe("with release_date only", function() {
+      it("select 'embargo', require that release_date, allow any visibility", function() {
+        target.requireEmbargo(undefined, "2017-01-01");
+        expect(element.find("[type='radio'][value='embargo']")).toBeChecked();
+        expect(element.find("[type='radio'][value='embargo']")).not.toBeDisabled();
+        expect(target.getEmbargoDateInput()).toHaveValue("2017-01-01");
+        expect(target.getEmbargoDateInput()).toBeDisabled();
+        expect(target.getVisibilityAfterEmbargoInput()).not.toBeDisabled();
+      });
+    });
+    describe("with release_date and visibility", function() {
+      it("select 'embargo', require that release_date, require visibility", function() {
+        target.requireEmbargo("open", "2017-01-01");
+        expect(element.find("[type='radio'][value='embargo']")).toBeChecked();
+        expect(element.find("[type='radio'][value='embargo']")).not.toBeDisabled();
+        expect(target.getEmbargoDateInput()).toHaveValue("2017-01-01");
+        expect(target.getEmbargoDateInput()).toBeDisabled();
+        expect(target.getVisibilityAfterEmbargoInput()).toHaveValue("open");
+        expect(target.getVisibilityAfterEmbargoInput()).toBeDisabled();
+      });
+    });
+  });
+
+  //enableVisibilityOptions(options)
+  describe("enableVisibilityOptions", function() {
+    describe("with array of options", function() {
+      it("enables listed radio buttons, and disables any unlisted", function() {
+        target.enableVisibilityOptions(["open","restricted"]);
+        expect(element.find("[type='radio'][value='open']")).not.toBeDisabled();
+        expect(element.find("[type='radio'][value='authenticated']")).toBeDisabled();
+        expect(element.find("[type='radio'][value='embargo']")).toBeDisabled();
+        expect(element.find("[type='radio'][value='restricted']")).not.toBeDisabled();
+      });
+    });
+    describe("with no options", function() {
+      it("disables all radio buttons", function() {
+        target.enableVisibilityOptions([]);
+        expect(element.find("[type='radio'][value='open']")).toBeDisabled();
+        expect(element.find("[type='radio'][value='authenticated']")).toBeDisabled();
+        expect(element.find("[type='radio'][value='embargo']")).toBeDisabled();
+        expect(element.find("[type='radio'][value='restricted']")).toBeDisabled();
+      });
+    });
+  });
+
+  //disableVisibilityOptions(options)
+  describe("disableVisibilityOptions", function() {
+    describe("with array of options", function() {
+      it("disables listed radio buttons, and enables any unlisted", function() {
+        target.disableVisibilityOptions(["open","restricted"]);
+        expect(element.find("[type='radio'][value='open']")).toBeDisabled();
+        expect(element.find("[type='radio'][value='authenticated']")).not.toBeDisabled();
+        expect(element.find("[type='radio'][value='embargo']")).not.toBeDisabled();
+        expect(element.find("[type='radio'][value='restricted']")).toBeDisabled();
+      });
+    });
+    describe("with no options", function() {
+      it("enables all radio buttons", function() {
+        target.disableVisibilityOptions([]);
+        expect(element.find("[type='radio'][value='open']")).not.toBeDisabled();
+        expect(element.find("[type='radio'][value='authenticated']")).not.toBeDisabled();
+        expect(element.find("[type='radio'][value='embargo']")).not.toBeDisabled();
+        expect(element.find("[type='radio'][value='restricted']")).not.toBeDisabled();
+      });
+    });
+  });
+
+  //getMatcherForVisibilities(options)
+  describe("getMatcherForVisibilities", function() {
+    describe("with array of options", function() {
+      it("returns a jQuery matcher to match ONLY visibility radio buttons listed in options", function() {
+        expect(target.getMatcherForVisibilities(["one","two","three"])).toEqual("[type='radio'][value='one'],[type='radio'][value='two'],[type='radio'][value='three']");
+      });
+    });
+    describe("with no options", function() {
+      it("returns an empty string (matches none of the radio buttons)", function() {
+        expect(target.getMatcherForVisibilities([])).toEqual("");
+      });
+    });
+  });
+
+  //getMatcherForNotVisibilities(options)
+  describe("getMatcherForNotVisibilities", function() {
+    describe("with array of options", function() {
+      it("returns a jQuery matcher to match visibility radio buttons NOT listed in options", function() {
+        expect(target.getMatcherForNotVisibilities(["one","two","three"])).toEqual("[type='radio'][value!='one'][value!='two'][value!='three']");
+      });
+    });
+    describe("with no options", function() {
+      it("returns a jQuery matcher to match all visibility radio buttons", function() {
+        expect(target.getMatcherForNotVisibilities([])).toEqual("[type='radio']");
+      });
+    });
+  });
+
+  //restrictEmbargoDate(release_date, release_before)
+  describe("restrictEmbargoDate", function() {
+    describe("with no date specified", function() {
+      it("sets a minimum date of today", function() {
+        target.restrictEmbargoDate("",false);
+        expect(target.getEmbargoDateInput()).toHaveProp("min", target.getToday());
+      });
+    });
+    describe("with exact release_date specified", function() {
+      it("sets release_date and disables field", function() {
+        target.restrictEmbargoDate("2017-01-01",false);
+        var input = target.getEmbargoDateInput();
+        expect(input).toHaveValue("2017-01-01");
+        expect(input).toBeDisabled();
+      });
+    });
+    describe("with release_date specified and prior dates allowed", function() {
+      it("sets minimum date of today, maximum date of release_date and enables field", function() {
+        var futureDate = getOneYearFromToday();
+        target.restrictEmbargoDate(futureDate, true);
+        var input = target.getEmbargoDateInput();
+        expect(input).toHaveProp("min", target.getToday());
+        expect(input).toHaveProp("max", futureDate);
+        expect(input).not.toBeDisabled();
+      });
+    });
+  });
+
+  // selectVisibilityAfterEmbargo(visibility)
+  describe("selectVisibilityAfterEmbargo", function() {
+    describe("with 'open'", function() {
+      it("selects 'open' option and disables field", function() {
+        target.selectVisibilityAfterEmbargo("open");
+        var input = target.getVisibilityAfterEmbargoInput();
+        expect(input.find("option[value='open']")).toBeSelected();
+        expect(input).toBeDisabled();
+      });
+    });
+    describe("with no option", function() {
+      it("enables field", function() {
+        target.selectVisibilityAfterEmbargo("");
+        var input = target.getVisibilityAfterEmbargoInput();
+        expect(input).not.toBeDisabled();
+      });
+    });
+  });
+
+  // enableAllOptions()
+  describe("enableAllOptions", function() {
+    beforeEach(function() {
+      element.find("[type='radio'][value='open']").prop("disabled", true);
+      target.getEmbargoDateInput().prop("disabled", true);
+      target.getVisibilityAfterEmbargoInput().prop("disabled", true);
+    });
+    it("enables all visibility fields", function() {
+      target.enableAllOptions();
+      expect(element.find("[type='radio'][value='open']")).not.toBeDisabled();
+      expect(element.find("[type='radio'][value='authenticated']")).not.toBeDisabled();
+      expect(element.find("[type='radio'][value='embargo']")).not.toBeDisabled();
+      expect(element.find("[type='radio'][value='restricted']")).not.toBeDisabled();
+      expect(element.find("[type='radio'][value='lease']")).not.toBeDisabled();
+      expect(target.getEmbargoDateInput()).not.toBeDisabled();
+      expect(target.getVisibilityAfterEmbargoInput()).not.toBeDisabled();
+    });
+  });
+
+  // getEmbargoDateInput()
+  describe("getEmbargoDateInput", function() {
+    it("returns embargo date input", function() {
+      expect(target.getEmbargoDateInput()).toHaveProp("name", "generic_work[embargo_release_date]");
+    });
+  });
+
+  // getVisibilityAfterEmbargoInput()
+  describe("getVisibilityAfterEmbargoInput", function() {
+    it("returns visibility after embargo selectbox", function() {
+      expect(target.getVisibilityAfterEmbargoInput()).toHaveProp("name", "generic_work[visibility_after_embargo]");
+    });
+  });
+
+  // isToday(dateString)
+  describe("isToday", function() {
+    describe("with today's date", function() {
+      it("is true", function() {
+        expect(target.isToday(target.getToday())).toEqual(true);
+      });
+    });
+    describe("with past date", function() {
+      it("is false", function() {
+        expect(target.isToday("2016-12-31")).toEqual(false);
+      });
+    });
+    describe("with future date", function() {
+      it("is false", function() {
+        expect(target.isToday(getOneYearFromToday())).toEqual(false);
+      });
+    });
+  });
+});
+
+// Generate a form that includes AdminSet selectbox (with a passed in option)
+// AND the visibility radio button options
+function visibilityForm(admin_set_option) {
+    return '<form id="new_generic_work">' +
+        '  <div>' +
+        '    <select id="generic_work_admin_set_id">' +
+        '     ' + admin_set_option +
+        '    </select>' +
+        '  </div>' +
+        '  <div>' +
+        '    <ul class="visibility">' +
+        '      <li class="radio">' +
+        '        <label>' +
+        '          <input data-target="#collapsePublic" type="radio" value="open" name="generic_work[visibility]"/>Public' +
+        '          <div class="collapse in" id="collapsePublic">' +
+        '            <p>Public message that is collapsed by default</p>' +
+        '          </div>' +
+        '        </label>' +
+        '      </li>' +
+        '      <li class="radio">' +
+        '        <label>' +
+        '          <input type="radio" value="authenticated" name="generic_work[visibility]"/>Your Institution' +
+        '        </label>' +
+        '      </li>' +
+        '      <li class="radio">' +
+        '        <label>' +
+        '          <input data-target="#collapseEmbargo" type="radio" value="embargo" name="generic_work[visibility]"/>Embargo' +
+        '          <div class="collapse in" id="collapseEmbargo">' +
+        '            <input type="date" id="generic_work_embargo_release_date" name="generic_work[embargo_release_date]"/>' +
+        '            <select id="generic_work_visibility_after_embargo" name="generic_work[visibility_after_embargo]">' +
+        '              <option value="open">Open Access</option>' +
+        '              <option value="authenticated">Institution Name</option>' +
+        '            </select>' +
+        '          </div>' +
+        '        </label>' +
+        '      </li>' +
+        '      <li class="radio">' +
+        '        <label>' +
+        '          <input type="radio" value="lease" name="generic_work[visibility]"/>Lease' +
+        '        </label>' +
+        '      </li>' +
+        '      <li class="radio">' +
+        '        <label>' +
+        '          <input type="radio" value="restricted" name="generic_work[visibility]"/>Private' +
+        '        </label>' +
+        '      </li>' +
+        '    </ul>' +
+        '  </div>' +
+        '</form>';
+}
+
+
+// Get the date one year from today in YYYY-MM-DD format
+function getOneYearFromToday() {
+  var today = new Date();
+  var dd = today.getDate();
+  var mm = today.getMonth() + 1;  // January is month 0
+  var yyyy = today.getFullYear() + 1; // Add one year to this year
+
+  // prepend zeros as needed
+  if(dd < 10) {
+    dd = '0' + dd;
+  }
+  if(mm < 10) {
+    mm = '0' + mm;
+  }
+  return yyyy + '-' + mm + '-' + dd;
+}