sufia 7.0.0.beta4 → 7.0.0.rc1

data/spec/forms/sufia/forms/batch_upload_form_spec.rb

@@ -21,7 +21,7 @@ describe Sufia::Forms::BatchUploadForm do
       expect(subject.route_key).to eq 'batch_uploads'
     end
     it "has a param_key" do
-      expect(subject.param_key).to eq 'generic_work'
+      expect(subject.param_key).to eq 'batch_upload_item'
     end
   end
 

data/spec/helpers/blacklight_helper_spec.rb

@@ -1,32 +1,45 @@
 RSpec.describe BlacklightHelper, type: :helper do
   let(:blacklight_config) { CatalogController.blacklight_config }
   let(:attributes) do
-    { 'creator_tesim' => ['Justin', 'Joe'],
-      'depositor_tesim' => ['jcoyne@justincoyne.com'],
+    { 'creator_tesim'        => ['Justin', 'Joe'],
+      'depositor_tesim'      => ['jcoyne@justincoyne.com'],
       'proxy_depositor_ssim' => ['atz@stanford.edu'],
-      'description_tesim' => ['This links to http://example.com/ What about that?'],
-      'date_uploaded_dtsi' => '2013-03-14T00:00:00Z',
+      'description_tesim'    => ['This links to http://example.com/ What about that?'],
+      'date_uploaded_dtsi'   => '2013-03-14T00:00:00Z',
       'rights_tesim' => ["http://creativecommons.org/publicdomain/zero/1.0/",
                          "http://creativecommons.org/publicdomain/mark/1.0/",
                          "http://www.europeana.eu/portal/rights/rr-r.html"],
-      'identifier_tesim' => ['65434567654345654'],
-      'keyword_tesim' => ['taco', 'mustache'],
-      'subject_tesim' => ['Awesome'],
-      'contributor_tesim' => ['Bird, Big'],
-      'publisher_tesim' => ['Penguin Random House'],
-      'based_near_tesim' => ['Pennsylvania'],
-      'language_tesim' => ['English'],
-      'resource_type_tesim' => ['Capstone Project'] }
+      'identifier_tesim'     => ['65434567654345654'],
+      'keyword_tesim'        => ['taco', 'mustache'],
+      'subject_tesim'        => ['Awesome'],
+      'contributor_tesim'    => ['Bird, Big'],
+      'publisher_tesim'      => ['Penguin Random House'],
+      'based_near_tesim'     => ['Pennsylvania'],
+      'language_tesim'       => ['English'],
+      'resource_type_tesim'  => ['Capstone Project'] }
   end
 
   let(:document) { SolrDocument.new(attributes) }
   before do
     allow(helper).to receive(:blacklight_config).and_return(blacklight_config)
+    allow(controller).to receive(:action_name).and_return('index')
   end
 
   describe "render_index_field_value" do
-    include SufiaHelper
-    subject { render_index_field_value document, field: field_name }
+    include SufiaHelper # FIXME: isolate testing BlacklightHelper, not SufiaHelper. Also, this method is odd.
+    def search_action_path(stuff)
+      search_catalog_path(stuff)
+    end
+
+    subject { index_presenter(document).field_value field_name }
+
+    context "description_tesim" do
+      let(:field_name) { 'description_tesim' }
+      it do
+        pending 'need a different way to test description'
+        is_expected.to eq '<span itemprop="description">This links to <a href="http://example.com/"><span class="glyphicon glyphicon-new-window"></span> http://example.com/</a> What about that?</span>'
+      end
+    end
 
     context "rights_tesim" do
       let(:field_name) { 'rights_tesim' }
@@ -37,54 +50,51 @@ RSpec.describe BlacklightHelper, type: :helper do
       let(:search_state) { Blacklight::SearchState.new(params, CatalogController.blacklight_config) }
       before do
         allow(controller).to receive(:search_state).and_return(search_state)
-        def search_action_path(stuff)
-          search_catalog_path(stuff)
-        end
       end
 
       context "keyword_tesim" do
         let(:field_name) { 'keyword_tesim' }
-        it { is_expected.to eq "<span itemprop=\"keywords\"><a href=\"/catalog?f%5Bkeyword_sim%5D%5B%5D=taco\"><span itemprop=\"keywords\">taco</span></a></span> and <span itemprop=\"keywords\"><a href=\"/catalog?f%5Bkeyword_sim%5D%5B%5D=mustache\"><span itemprop=\"keywords\">mustache</span></a></span>" }
+        it { is_expected.to eq '<span itemprop="keywords"><a href="/catalog?f%5Bkeyword_sim%5D%5B%5D=taco">taco</a></span> and <span itemprop="keywords"><a href="/catalog?f%5Bkeyword_sim%5D%5B%5D=mustache">mustache</a></span>' }
       end
 
       context "subject_tesim" do
         let(:field_name) { 'subject_tesim' }
-        it { is_expected.to eq "<span itemprop=\"about\"><a href=\"/catalog?f%5Bsubject_sim%5D%5B%5D=Awesome\"><span itemprop=\"about\">Awesome</span></a></span>" }
+        it { is_expected.to eq '<span itemprop="about"><a href="/catalog?f%5Bsubject_sim%5D%5B%5D=Awesome">Awesome</a></span>' }
       end
 
       context "creator_tesim" do
         let(:field_name) { 'creator_tesim' }
-        it { is_expected.to eq "<span itemprop=\"creator\"><a href=\"/catalog?f%5Bcreator_sim%5D%5B%5D=Justin\"><span itemprop=\"creator\">Justin</span></a></span> and <span itemprop=\"creator\"><a href=\"/catalog?f%5Bcreator_sim%5D%5B%5D=Joe\"><span itemprop=\"creator\">Joe</span></a></span>" }
+        it { is_expected.to eq '<span itemprop="creator"><a href="/catalog?f%5Bcreator_sim%5D%5B%5D=Justin">Justin</a></span> and <span itemprop="creator"><a href="/catalog?f%5Bcreator_sim%5D%5B%5D=Joe">Joe</a></span>' }
       end
 
       context "contributor_tesim" do
         let(:field_name) { 'contributor_tesim' }
-        it { is_expected.to eq "<span itemprop=\"contributor\"><a href=\"/catalog?Bird%2C+Big=%22contributor%22&amp;search_field=advanced\">Bird, Big</a></span>" }
+        it { is_expected.to eq '<span itemprop="contributor"><a href="/catalog?f%5Bcontributor_sim%5D%5B%5D=Bird%2C+Big">Bird, Big</a></span>' }
       end
 
       context "publisher_tesim" do
         let(:field_name) { 'publisher_tesim' }
-        it { is_expected.to eq "<span itemprop=\"publisher\"><a href=\"/catalog?f%5Bpublisher_sim%5D%5B%5D=Penguin+Random+House\"><span itemprop=\"publisher\">Penguin Random House</span></a></span>" }
+        it { is_expected.to eq '<span itemprop="publisher"><a href="/catalog?f%5Bpublisher_sim%5D%5B%5D=Penguin+Random+House">Penguin Random House</a></span>' }
       end
 
       context "location_tesim" do
         let(:field_name) { 'based_near_tesim' }
-        it { is_expected.to eq "<span itemprop=\"contentLocation\"><a href=\"/catalog?f%5Bbased_near_sim%5D%5B%5D=Pennsylvania\"><span itemprop=\"contentLocation\">Pennsylvania</span></a></span>" }
+        it { is_expected.to eq '<span itemprop="contentLocation"><a href="/catalog?f%5Bbased_near_sim%5D%5B%5D=Pennsylvania">Pennsylvania</a></span>' }
       end
 
       context "language_tesim" do
         let(:field_name) { 'language_tesim' }
-        it { is_expected.to eq "<span itemprop=\"inLanguage\"><a href=\"/catalog?f%5Blanguage_sim%5D%5B%5D=English\"><span itemprop=\"inLanguage\">English</span></a></span>" }
+        it { is_expected.to eq '<span itemprop="inLanguage"><a href="/catalog?f%5Blanguage_sim%5D%5B%5D=English">English</a></span>' }
       end
 
       context "resource_type_tesim" do
         let(:field_name) { 'resource_type_tesim' }
-        it { is_expected.to eq "<a href=\"/catalog?f%5Bresource_type_sim%5D%5B%5D=Capstone+Project\">Capstone Project</a>" }
+        it { is_expected.to eq '<a href="/catalog?f%5Bresource_type_sim%5D%5B%5D=Capstone+Project">Capstone Project</a>' }
       end
 
       context "identifier_tesim" do
         let(:field_name) { 'identifier_tesim' }
-        it { is_expected.to eq "<a href=\"/catalog?65434567654345654=%22identifier%22&amp;search_field=advanced\">65434567654345654</a>" }
+        it { is_expected.to eq '<a href="/catalog?identifier=%2265434567654345654%22&amp;search_field=advanced">65434567654345654</a>' }
       end
     end
   end

data/spec/helpers/{generic_work_helper_spec.rb → sufia/collections_helper_spec.rb}

@@ -1,4 +1,4 @@
-describe GenericWorkHelper do
+describe Sufia::CollectionsHelper do
   describe '#render_collection_links' do
     let!(:work_doc) { SolrDocument.new(id: '123', title_tesim: ['My GenericWork']) }
 

data/spec/helpers/sufia_helper_spec.rb

@@ -1,3 +1,7 @@
+def new_state
+  Blacklight::SearchState.new({}, CatalogController.blacklight_config)
+end
+
 describe SufiaHelper, type: :helper do
   describe "show_transfer_request_title" do
     let(:sender) { create(:user) }
@@ -15,36 +19,48 @@ describe SufiaHelper, type: :helper do
     end
   end
 
-  describe "#link_to_facet_list" do
-    def search_state_double(value)
-      double('SearchState', add_facet_params_and_redirect: { f: { vehicle_type_sim: [value] } })
-    end
-    let(:search_state_for_car) { search_state_double("car") }
-    let(:search_state_for_truck) { search_state_double("truck") }
+  context 'link helpers' do
     before do
-      allow(helper).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)
-      allow(helper).to receive(:search_state).exactly(2).times.and_return(search_state_for_car, search_state_for_truck)
       allow(helper).to receive(:search_action_path) do |*args|
         search_catalog_path(*args)
       end
+      allow(helper).to receive(:search_state).and_return(new_state)
     end
 
-    context "with values" do
-      subject { helper.link_to_facet_list(['car', 'truck'], 'vehicle_type') }
+    describe "#link_to_facet_list" do
+      context "with values" do
+        subject { helper.link_to_facet_list(['car', 'truck'], 'vehicle_type') }
+        it "joins the values" do
+          expect(helper).to receive(:search_state).exactly(2).times
+          car_link   = search_catalog_path(f: { 'vehicle_type_sim' => ['car'] })
+          truck_link = search_catalog_path(f: { 'vehicle_type_sim' => ['truck'] })
+          expect(subject).to eq "<a href=\"#{car_link}\">car</a>, <a href=\"#{truck_link}\">truck</a>"
+          expect(subject).to be_a ActiveSupport::SafeBuffer
+          expect(subject).to be_html_safe
+        end
+      end
 
-      it "joins the values" do
-        car_link = search_catalog_path(f: { 'vehicle_type_sim' => ['car'] })
-        truck_link = search_catalog_path(f: { 'vehicle_type_sim' => ['truck'] })
-        expect(subject).to eq "<a href=\"#{car_link}\">car</a>, <a href=\"#{truck_link}\">truck</a>"
-        expect(subject).to be_html_safe
+      context "without values" do
+        subject { helper.link_to_facet_list([], 'vehicle_type') }
+        it "shows the default text" do
+          expect(subject).to eq "No value entered"
+          expect(subject).to be_a ActiveSupport::SafeBuffer
+          expect(subject).to be_html_safe
+        end
       end
     end
 
-    context "without values" do
-      subject { helper.link_to_facet_list([], 'vehicle_type') }
-
-      it "shows the default text" do
-        expect(subject).to eq "No value entered"
+    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
+      end
+      subject { helper.index_field_link(args) }
+      it 'returns 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>'
       end
     end
   end
@@ -55,7 +71,6 @@ describe SufiaHelper, type: :helper do
       before { allow(helper).to receive(:params).and_return(cq: 'foo') }
       it { is_expected.to have_collection_search_parameters }
     end
-
     context "when cq is not set" do
       before { allow(helper).to receive(:params).and_return(cq: '') }
       it { is_expected.not_to have_collection_search_parameters }
@@ -70,12 +85,10 @@ describe SufiaHelper, type: :helper do
 
   describe "#link_to_telephone" do
     subject { helper.link_to_telephone(user) }
-
     context "when user is set" do
       let(:user) { mock_model(User, telephone: '867-5309') }
       it { is_expected.to eq "<a href=\"wtai://wp/mc;867-5309\">867-5309</a>" }
     end
-
     context "when user is not set" do
       let(:user) { nil }
       it { is_expected.to be_nil }
@@ -167,7 +180,6 @@ describe SufiaHelper, type: :helper do
 
   describe '#zotero_label' do
     subject { helper }
-
     it { is_expected.to respond_to(:zotero_label) }
   end
 
@@ -198,16 +210,42 @@ describe SufiaHelper, type: :helper do
   end
 
   describe "#iconify_auto_link" do
-    subject { helper.iconify_auto_link('Foo < http://www.example.com. & More text') }
-    it "escapes input" do
-      expect(subject).to start_with('Foo &lt;')
-      expect(subject).to end_with('. &amp; More text')
+    let(:text)              { 'Foo < http://www.example.com. & More text' }
+    let(:linked_text)       { 'Foo &lt; <a href="http://www.example.com"><span class="glyphicon glyphicon-new-window"></span> http://www.example.com</a>. &amp; More text' }
+    let(:document)          { SolrDocument.new(has_model_ssim: ['GenericWork'], id: 512, title_tesim: text, description_tesim: text) }
+    let(:blacklight_config) { CatalogController.blacklight_config }
+    before do
+      allow(controller).to receive(:action_name).and_return('index')
+      allow(helper).to receive(:blacklight_config).and_return(blacklight_config)
+    end
+    it "boring String argument" do
+      expect(helper.iconify_auto_link('no escapes or links necessary')).to eq 'no escapes or links necessary'
+      expect(helper.iconify_auto_link('no escapes or links necessary', false)).to eq 'no escapes or links necessary'
     end
-    it "adds links" do
-      expect(subject).to include('<a href="http://www.example.com">')
+    context "interesting String argument" do
+      subject { helper.iconify_auto_link(text) }
+      it "escapes input" do
+        expect(subject).to start_with('Foo &lt;').and end_with('. &amp; More text')
+      end
+      it "adds links" do
+        expect(subject).to include('<a href="http://www.example.com">')
+      end
+      it "adds icons" do
+        expect(subject).to include('class="glyphicon glyphicon-new-window"')
+      end
     end
-    it "adds icons" do
-      expect(subject).to include('class="glyphicon glyphicon-new-window"')
+
+    context "when using a hash argument" do
+      subject { helper.iconify_auto_link(arg) }
+      describe "auto-linking in the title" do
+        let(:arg) { { document: document, value: [text], config: blacklight_config.index_fields['title_tesim'], field: 'title_tesim' } }
+        it { is_expected.to eq(linked_text) }
+      end
+
+      describe "auto-linking in the description" do
+        let(:arg) { { document: document, value: [text], config: blacklight_config.index_fields['description_tesim'], field: 'description_tesim' } }
+        it { is_expected.to eq(linked_text) }
+      end
     end
   end
 

data/spec/javascripts/autocomplete_spec.js.coffee

@@ -5,7 +5,7 @@ describe "auto complete", ->
     @spy_on_json = spyOn($, 'getJSON').and.returnValue resp
 
     #set up a key down event to trigger the auto complete
-    @typeEvent = $.Event( 'keydown' )
+    @typeEvent = $.Event('keydown')
     @typeEvent.keyCode = 70 # lower case f
 
     #define the jasmine clock so we can control time
@@ -18,8 +18,8 @@ describe "auto complete", ->
   describe "language", ->
     beforeEach ->
       # setup two inputs for us to attach  auto complete to
-      setFixtures  '<input class="generic_work_language"  value="" id="generic_work_language" type="text" >
-                    <input class="generic_work_language"  value="" type="text">'
+      setFixtures  '<input class="generic_work_language"  value="" id="generic_work_language" type="text" data-autocomplete="language" data-autocomplete-url="foo">
+                    <input class="generic_work_language"  value="" type="text" data-autocomplete="language" data-autocomplete-url="foo">'
 
       # run all Blacklight.onload functions
       Blacklight.activate()
@@ -58,8 +58,8 @@ describe "auto complete", ->
   describe "subject", ->
     beforeEach ->
       # setup two inputs for us to attach  auto complete to
-      setFixtures  '<input class="generic_work_subject"  value="" id="generic_work_subject" type="text" >
-                    <input class="generic_work_subject"  value="" type="text">'
+      setFixtures  '<input class="generic_work_subject"  value="" id="generic_work_subject" type="text" data-autocomplete="subject" data-autocomplete-url="foo">
+                    <input class="generic_work_subject"  value="" type="text" data-autocomplete="subject" data-autocomplete-url="foo">'
 
       # run all Blacklight.onload functions
       Blacklight.activate()
@@ -99,8 +99,8 @@ describe "auto complete", ->
   describe "location", ->
     beforeEach ->
       # setup two inputs for us to attach  auto complete to
-      setFixtures  '<input class="generic_work_based_near"  value="" id="generic_work_based_near" type="text" >
-                    <input class="generic_work_based_near"  value="" type="text">'
+      setFixtures  '<input class="generic_work_based_near"  value="" id="generic_work_based_near" type="text" data-autocomplete="based_near" data-autocomplete-url="foo">
+                    <input class="generic_work_based_near"  value="" type="text" data-autocomplete="based_near" data-autocomplete-url="foo">'
 
       # run all Blacklight.onload functions
       Blacklight.activate()

data/spec/javascripts/save_work_spec.js

@@ -6,17 +6,13 @@ describe("SaveWorkControl", function() {
       check: function() { },
       uncheck: function() { },
     };
-    var form = {
-      on: function () { }
-    };
-    var element = {
-      size: function() { return 1 },
-      closest: function() { return form },
-      data: function() { return }
-    };
 
     beforeEach(function() {
-      target = new control.SaveWorkControl(element);
+      var fixture = setFixtures('<form id="edit_generic_work">' +
+        '<aside id="form-progress"><ul><li id="required-metadata"><li id="required-files"></ul>' +
+        '<input type="checkbox" name="agreement" id="agreement" value="1" required="required" checked="checked" />' +
+        '<input type="submit"></aside></form>');
+      target = new control.SaveWorkControl(fixture.find('#form-progress'));
       target.requiredMetadata = mockCheckbox;
       spyOn(mockCheckbox, 'check').and.stub();
       spyOn(mockCheckbox, 'uncheck').and.stub();
@@ -80,25 +76,27 @@ describe("SaveWorkControl", function() {
       uncheck: function() { },
     };
     var form_id = 'new_generic_work';
-    var form = {
-      attr: function() { return form_id },
-      on: function() { },
-    };
-    var element = {
-      size: function() { return 1 },
-      closest: function() { return form },
-      data: function() { return }
-    };
 
-    beforeEach(function() {
-      target = new control.SaveWorkControl(element);
+    var buildTarget = function(form_id) {
+      var buildFixture = function(id) {
+        return setFixtures('<form id="' + id + '">' +
+        '<aside id="form-progress"><ul><li id="required-metadata"><li id="required-files"></ul>' +
+        '<input type="checkbox" name="agreement" id="agreement" value="1" required="required" checked="checked" />' +
+        '<input type="submit"></aside></form>')
+      }
+      target = new control.SaveWorkControl(buildFixture(form_id).find('#form-progress'));
       target.requiredFiles = mockCheckbox;
+      return target
+    }
+
+    beforeEach(function() {
       spyOn(mockCheckbox, 'check').and.stub();
       spyOn(mockCheckbox, 'uncheck').and.stub();
     });
 
     describe("when required files are present", function() {
       beforeEach(function() {
+        target = buildTarget(form_id)
         target.uploads = {
           hasFiles: true
         };
@@ -112,6 +110,7 @@ describe("SaveWorkControl", function() {
 
     describe("when a required files are missing", function() {
       beforeEach(function() {
+        target = buildTarget(form_id)
         target.uploads = {
           hasFiles: false
         };
@@ -127,6 +126,7 @@ describe("SaveWorkControl", function() {
     describe("when a required files are missing and it's an edit form", function() {
       beforeEach(function() {
         form_id = 'edit_generic_work'
+        target = buildTarget(form_id)
       });
       it("is complete", function() {
         target.validateFiles();

data/spec/lib/sufia/configuration_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Sufia::Configuration do
+  subject { described_class.new }
+
+  it { is_expected.to respond_to(:persistent_hostpath) }
+  it { is_expected.to respond_to(:redis_namespace) }
+  it { is_expected.to respond_to(:libreoffice_path) }
+  it { is_expected.to respond_to(:browse_everything) }
+  it { is_expected.to respond_to(:analytics) }
+  it { is_expected.to respond_to(:citations) }
+  it { is_expected.to respond_to(:max_notifications_for_dashboard) }
+  it { is_expected.to respond_to(:activity_to_show_default_seconds_since_now) }
+  it { is_expected.to respond_to(:arkivo_api) }
+  it { is_expected.to respond_to(:active_deposit_agreement_acceptance) }
+  it { is_expected.to respond_to(:batch_user_key) }
+  it { is_expected.to respond_to(:audit_user_key) }
+  it { is_expected.to respond_to(:upload_path) }
+  it { is_expected.to respond_to(:always_display_share_button) }
+  it { is_expected.to respond_to(:google_analytics_id) }
+  it { is_expected.to respond_to(:analytic_start_date) }
+  it { is_expected.to respond_to(:display_media_download_link) }
+  it { is_expected.to respond_to(:permission_levels) }
+  it { is_expected.to respond_to(:owner_permission_levels) }
+  it { is_expected.to respond_to(:translate_uri_to_id) }
+  it { is_expected.to respond_to(:translate_id_to_uri) }
+  it { is_expected.to respond_to(:contact_email) }
+  it { is_expected.to respond_to(:subject_prefix) }
+  it { is_expected.to respond_to(:model_to_create) }
+end

data/spec/lib/sufia/user_stat_importer_spec.rb

@@ -2,33 +2,33 @@ describe Sufia::UserStatImporter do
   before do
     allow(Sufia.config).to receive(:analytic_start_date) { dates[0] }
 
-    allow(FileViewStat).to receive(:ga_statistics) do |_date, file_id|
-      case file_id
-      when bilbo_file_1.id
+    allow(FileViewStat).to receive(:ga_statistics) do |_date, file|
+      case file
+      when bilbo_file_1
         bilbo_file_1_pageview_stats
-      when bilbo_file_2.id
+      when bilbo_file_2
         bilbo_file_2_pageview_stats
       else
         frodo_file_1_pageview_stats
       end
     end
 
-    allow(FileDownloadStat).to receive(:ga_statistics) do |_date, file_id|
-      case file_id
-      when bilbo_file_1.id
+    allow(FileDownloadStat).to receive(:ga_statistics) do |_date, file|
+      case file
+      when bilbo_file_1
         bilbo_file_1_download_stats
-      when bilbo_file_2.id
+      when bilbo_file_2
         bilbo_file_2_download_stats
       else
         frodo_file_1_download_stats
       end
     end
 
-    allow(WorkViewStat).to receive(:ga_statistics) do |_date, work_id|
-      case work_id
-      when bilbo_work_1.id
+    allow(WorkViewStat).to receive(:ga_statistics) do |_date, work|
+      case work
+      when bilbo_work_1
         bilbo_work_1_pageview_stats
-      when bilbo_work_2.id
+      when bilbo_work_2
         bilbo_work_2_pageview_stats
       else
         frodo_work_1_pageview_stats
@@ -36,48 +36,33 @@ describe Sufia::UserStatImporter do
     end
   end
 
-  let(:bilbo) { FactoryGirl.create(:user, email: 'bilbo@example.com') }
-  let(:frodo) { FactoryGirl.create(:user, email: 'frodo@example.com') }
-  let!(:gollum) { FactoryGirl.create(:user, email: 'gollum@example.com') }
+  let(:bilbo) { create(:user, email: 'bilbo@example.com') }
+  let(:frodo) { create(:user, email: 'frodo@example.com') }
+  let!(:gollum) { create(:user, email: 'gollum@example.com') }
 
   let!(:bilbo_file_1) do
-    FileSet.new(id: 'xyzbilbo1', title: ['bilbo 1']).tap do |f|
-      f.apply_depositor_metadata(bilbo.email)
-      f.save
-    end
+    create(:file_set, id: 'xyzbilbo1', user: bilbo)
   end
 
   let!(:bilbo_file_2) do
-    FileSet.new(id: 'xyzbilbo2', title: ['bilbo 2']).tap do |f|
-      f.apply_depositor_metadata(bilbo.email)
-      f.save
-    end
+    create(:file_set, id: 'xyzbilbo2', user: bilbo)
   end
 
   let!(:frodo_file_1) do
-    FileSet.new(id: 'xyzfrodo1', title: ['frodo 1']).tap do |f|
-      f.apply_depositor_metadata(frodo.email)
-      f.save
-    end
+    create(:file_set, id: 'xyzfrodo1', user: frodo)
   end
 
   # work
   let!(:bilbo_work_1) do
-    GenericWork.create(id: 'xyzbilbowork1', title: ['bilbo work 1']) do |work|
-      work.apply_depositor_metadata(bilbo.email)
-    end
+    create(:work, id: 'xyzbilbowork1', user: bilbo)
   end
 
   let!(:bilbo_work_2) do
-    GenericWork.create(id: 'xyzbilbowork2', title: ['bilbo work 2']) do |work|
-      work.apply_depositor_metadata(bilbo.email)
-    end
+    create(:work, id: 'xyzbilbowork2', user: bilbo)
   end
 
   let!(:frodo_work_1) do
-    GenericWork.create(id: 'xyzfrodowork1', title: ['frodo work 1']) do |work|
-      work.apply_depositor_metadata(frodo.email)
-    end
+    create(:work, id: 'xyzfrodowork1', user: frodo)
   end
 
   let(:dates) {