sufia 6.0.0.rc2 → 6.0.0.rc3

data/spec/controllers/collections_controller_spec.rb

@@ -89,7 +89,7 @@ describe CollectionsController do
 
       it "should set collection on members" do
         put :update, id: collection, collection: {members:"add"}, batch_document_ids: [@asset3.id, @asset1.id, @asset2.id]
-        expect(response).to redirect_to routes.url_helpers.collection_path(collection.noid)
+        expect(response).to redirect_to routes.url_helpers.collection_path(collection)
         expect(assigns[:collection].members).to match_array [@asset2, @asset3, @asset1]
         asset_results = ActiveFedora::SolrService.instance.conn.get "select", params:{fq:["id:\"#{@asset2.id}\""],fl:['id',Solrizer.solr_name(:collection)]}
         expect(asset_results["response"]["numFound"]).to eq 1

data/spec/controllers/content_blocks_controller_spec.rb

@@ -6,10 +6,15 @@ describe ContentBlocksController, :type => :controller do
     before { request.env["HTTP_REFERER"] = "whence_i_came" }
 
     context "when not logged in" do
-      it "should redirect to root path" do
+      it "UPDATE should redirect to sign_in path" do
         patch :update, id: content_block, content_block: { value: 'foo' }
         expect(response).to redirect_to main_app.new_user_session_path
       end
+
+      it "CREATE should redirect to sign_in path" do
+        post :create, content_block: { name: 'NNN', value: 'VVV' }
+        expect(response).to redirect_to main_app.new_user_session_path
+      end
     end
 
     context "when logged in" do
@@ -19,18 +24,33 @@ describe ContentBlocksController, :type => :controller do
       context "as a user in the admin group" do
         before { expect(user).to receive(:groups).and_return( ['admin', 'registered']) }
 
-        it "should save" do
+        it "UPDATE should save" do
           patch :update, id: content_block, content_block: { value: 'foo' }
           expect(response).to redirect_to "whence_i_came"
           expect(assigns[:content_block].value).to eq 'foo'
         end
+
+        it "CREATE should save" do
+          expect {
+            post :create, content_block: { name: 'NNN', value: 'VVV', external_key: 'key' }
+          }.to change { ContentBlock.count}.by(1)
+          expect(response).to redirect_to "whence_i_came"
+          expect(assigns[:content_block].name).to eq 'NNN'
+          expect(assigns[:content_block].value).to eq 'VVV'
+          expect(assigns[:content_block].external_key).to eq 'key'
+        end
       end
 
       context "as a user without permission" do
-        it "should redirect to root path" do
+        it "UPDATE should redirect to root path" do
           patch :update, id: content_block, content_block: { value: 'foo' }
           expect(response).to redirect_to root_path
         end
+
+        it "CREATE should redirect to root path" do
+          post :create, content_block: { name: 'NNN', value: 'VVV' }
+          expect(response).to redirect_to root_path
+        end
       end
     end
   end

data/spec/controllers/downloads_controller_spec.rb

@@ -5,10 +5,10 @@ describe DownloadsController, :type => :controller do
   describe "with a file" do
     let(:depositor) { FactoryGirl.find_or_create(:archivist) }
     let(:file) do
-      GenericFile.new.tap do |f|
+      GenericFile.create do |f|
         f.apply_depositor_metadata(depositor.user_key)
-        f.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
-        f.save!
+        f.label = 'world.png'
+        f.add_file(File.open(fixture_path + '/world.png'), path: 'content', original_name: 'world.png', mime_type: 'image/png')
       end
     end
 
@@ -27,7 +27,7 @@ describe DownloadsController, :type => :controller do
         let(:expected_content) { expected_datastream.content }
 
         it "should default to returning configured default download" do
-          expect(DownloadsController.default_content_dsid).to eq "content"
+          expect(DownloadsController.default_file_path).to eq "content"
           expect(controller).to receive(:send_file_headers!).with({filename: 'world.png', disposition: 'inline', type: 'image/png' })
           get "show", id: file
           expect(response).to be_success
@@ -42,7 +42,7 @@ describe DownloadsController, :type => :controller do
           end
 
           it "should return requested datastreams" do
-            get "show", id: file, datastream_id: "characterization"
+            get "show", id: file, file: "characterization"
             expect(response).to be_success
             expect(response.body).to eq expected_content
           end

data/spec/controllers/generic_files_controller_spec.rb

@@ -42,16 +42,15 @@ describe GenericFilesController do
       context "when everything is perfect" do
         render_views
         it "spawns a content deposit event job" do
-          expect_any_instance_of(Sufia::GenericFile::Actor).to receive(:create_content).with(file, 'world.png', 'content').and_return(true)
+          expect_any_instance_of(Sufia::GenericFile::Actor).to receive(:create_content).with(file, 'world.png', 'content', 'image/png').and_return(true)
           xhr :post, :create, files: [file], 'Filename' => 'The world', batch_id: batch_id, permission: {group: { public: 'read' } }, terms_of_service: '1'
           expect(response.body).to eq '[{"name":null,"size":"","url":"/files/test123","thumbnail_url":"test123","delete_url":"deleteme","delete_type":"DELETE"}]'
           expect(flash[:error]).to be_nil
         end
 
         it "should create and save a file asset from the given params" do
-          # Now expecting iso8601 dates?
-          date_today = Time.now.utc.iso8601
-          allow(Date).to receive(:today).and_return(date_today)
+          date_today = DateTime.now
+          allow(DateTime).to receive(:now).and_return(date_today)
           expect {
             xhr :post, :create, files: [file], Filename: "The world", batch_id: batch_id,
                       permission: {"group"=>{"public"=>"read"} }, terms_of_service: '1'
@@ -65,8 +64,8 @@ describe GenericFilesController do
           file.rewind
           expect(saved_file.content.content).to eq (file.read)
           # Confirming that date_uploaded and date_modified were set
-          expect(saved_file.date_uploaded).to eq date_today
-          expect(saved_file.date_modified).to eq date_today
+          expect(saved_file.date_uploaded).to eq date_today.new_offset(0)
+          expect(saved_file.date_modified).to eq date_today.new_offset(0)
         end
 
         it "should record what user created the first version of content" do
@@ -214,7 +213,7 @@ describe GenericFilesController do
   describe "audit" do
     let(:generic_file) do
       GenericFile.create do |gf|
-        gf.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+        gf.add_file(File.open(fixture_path + '/world.png'), path: 'content', original_name: 'world.png')
         gf.apply_depositor_metadata(user)
       end
     end
@@ -293,7 +292,7 @@ describe GenericFilesController do
         allow(controller.request).to receive(:referer).and_return('foo')
         expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.dashboard.title'), Sufia::Engine.routes.url_helpers.dashboard_index_path)
         expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.dashboard.my.files'), Sufia::Engine.routes.url_helpers.dashboard_files_path)
-        expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.generic_file.browse_view'), Sufia::Engine.routes.url_helpers.generic_file_path(generic_file.noid))
+        expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.generic_file.browse_view'), Sufia::Engine.routes.url_helpers.generic_file_path(generic_file))
         get :stats, id: generic_file
         expect(response).to be_success
         expect(response).to render_template(:stats)
@@ -336,7 +335,7 @@ describe GenericFilesController do
       allow(controller.request).to receive(:referer).and_return('foo')
       expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.dashboard.title'), Sufia::Engine.routes.url_helpers.dashboard_index_path)
       expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.dashboard.my.files'), Sufia::Engine.routes.url_helpers.dashboard_files_path)
-      expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.generic_file.browse_view'), Sufia::Engine.routes.url_helpers.generic_file_path(generic_file.noid))
+      expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.generic_file.browse_view'), Sufia::Engine.routes.url_helpers.generic_file_path(generic_file))
       get :edit, id: generic_file
 
       expect(response).to be_success
@@ -408,8 +407,8 @@ describe GenericFilesController do
 
       before do
         allow_any_instance_of(GenericFile).to receive(:characterize)
-        actor1.create_content(fixture_file_upload(file1), file1, 'content')
-        actor2.create_content(fixture_file_upload(file2), file2, 'content')
+        actor1.create_content(fixture_file_upload(file1), file1, 'content', file1_type)
+        actor2.create_content(fixture_file_upload(file2), file2, 'content', file2_type)
       end
 
       describe "restoring a previous version" do
@@ -498,6 +497,7 @@ describe GenericFilesController do
         expect(response).to be_successful
         expect(response).to render_template('edit')
         expect(assigns[:generic_file]).to eq generic_file
+        expect(flash[:error]).to include 'Update was unsuccessful.'
       end
     end
   end
@@ -506,7 +506,7 @@ describe GenericFilesController do
     let(:generic_file) do
       GenericFile.create(id: 'test5') do |f|
         f.apply_depositor_metadata('archivist1@example.com')
-        f.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+        f.add_file(File.open(fixture_path + '/world.png'), path: 'content', original_name: 'world.png')
         # grant public read access explicitly
         f.read_groups = ['public']
       end

data/spec/controllers/homepage_controller_spec.rb

@@ -18,12 +18,25 @@ describe HomepageController, :type => :controller do
       sign_in user
     end
 
-    it "should set featured researcher" do
-      get :index
-      expect(response).to be_success
-      assigns(:featured_researcher).tap do |researcher|
-        expect(researcher).to be_kind_of ContentBlock
-        expect(researcher.name).to eq 'featured_researcher'
+    context 'with existing featured researcher' do
+      let!(:bilbo) { ContentBlock.create!(name: ContentBlock::RESEARCHER, value: 'Biblo Baggins', created_at: 2.hours.ago) }
+      let!(:frodo) { ContentBlock.create!(name: ContentBlock::RESEARCHER, value: 'Frodo Baggins', created_at: Time.now) }
+
+      it 'finds the featured researcher' do
+        get :index
+        expect(response).to be_success
+        expect(assigns(:featured_researcher)).to eq frodo
+      end
+    end
+
+    context 'with no featured researcher' do
+      it "should set featured researcher" do
+        get :index
+        expect(response).to be_success
+        assigns(:featured_researcher).tap do |researcher|
+          expect(researcher).to be_kind_of ContentBlock
+          expect(researcher.name).to eq 'featured_researcher'
+        end
       end
     end
 

data/spec/controllers/my/files_controller_spec.rb

@@ -19,7 +19,6 @@ describe My::FilesController, :type => :controller do
 
   let(:user) { FactoryGirl.find_or_create(:archivist) }
 
-
   before do
     sign_in user
     @my_file = FactoryGirl.create(:generic_file, depositor: user)
@@ -34,7 +33,7 @@ describe My::FilesController, :type => :controller do
     expect(response).to be_successful
   end
 
-  it "should paginate" do          
+  it "should paginate" do
     FactoryGirl.create(:generic_file)
     FactoryGirl.create(:generic_file)
     get :index, per_page: 2
@@ -59,21 +58,20 @@ describe My::FilesController, :type => :controller do
 
   describe "batch processing" do
     include Sufia::Messages
-    let (:batch_noid) {"batch_noid"}
-    let (:batch_noid2) {"batch_noid2"}
+    let (:batch_id) {"batch_id"}
+    let (:batch_id2) {"batch_id2"}
     let (:batch) {double}
 
     before do
-      allow(batch).to receive(:noid).and_return(batch_noid)
-      User.batchuser().send_message(user, single_success(batch_noid, batch), success_subject, sanitize_text = false)
-      User.batchuser().send_message(user, multiple_success(batch_noid2, [batch]), success_subject, sanitize_text = false)
+      allow(batch).to receive(:id).and_return(batch_id)
+      User.batchuser().send_message(user, single_success(batch_id, batch), success_subject, sanitize_text = false)
+      User.batchuser().send_message(user, multiple_success(batch_id2, [batch]), success_subject, sanitize_text = false)
       get :index
     end
     it "gets batches that are complete" do
       expect(assigns(:batches).count).to eq(2)
-      expect(assigns(:batches)).to include("ss-"+batch_noid)
-      expect(assigns(:batches)).to include("ss-"+batch_noid2)
+      expect(assigns(:batches)).to include("ss-"+batch_id)
+      expect(assigns(:batches)).to include("ss-"+batch_id2)
     end
   end
-
 end

data/spec/controllers/my/shares_controller_spec.rb

@@ -2,29 +2,38 @@ require 'spec_helper'
 
 describe My::SharesController, :type => :controller do
   describe "logged in user" do
+    let(:user) { FactoryGirl.find_or_create(:archivist) }
+
     before (:each) do
-      @user = FactoryGirl.find_or_create(:archivist)
-      sign_in @user
+      sign_in user
     end
 
     describe "#index" do
-      before do
-        GenericFile.destroy_all
-        Collection.destroy_all
-        @other_user = FactoryGirl.create(:user)
-        @my_file = FactoryGirl.create(:generic_file, depositor: @user)
-        @unshared_file = FactoryGirl.create(:generic_file, depositor: @other_user)
-        @shared_with_me = FactoryGirl.create(:generic_file).tap do |r|
-          r.apply_depositor_metadata @other_user
-          r.edit_users += [@user.user_key]
+      let(:other_user) { FactoryGirl.create(:user) }
+
+      let!(:my_file) { FactoryGirl.create(:generic_file, depositor: user) }
+      let!(:unshared_file) { FactoryGirl.create(:generic_file, depositor: other_user) }
+
+      let!(:shared_with_me) { FactoryGirl.create(:generic_file).tap do |r|
+          r.apply_depositor_metadata other_user
+          r.edit_users += [user.user_key]
           r.save!
         end
-        @shared_with_someone_else = FactoryGirl.create(:generic_file).tap do |r|
-          r.apply_depositor_metadata @user
-          r.edit_users += [@other_user.user_key]
+      }
+
+      let!(:shared_with_someone_else) { FactoryGirl.create(:generic_file).tap do |r|
+          r.apply_depositor_metadata user
+          r.edit_users += [other_user.user_key]
           r.save!
         end
-      end
+      }
+
+      let!(:my_collection) { Collection.new(title: "My collection").tap do |c|
+          c.apply_depositor_metadata(user.user_key)
+          c.save!
+        end
+      }
+
 
       it "should respond with success" do
         get :index
@@ -33,13 +42,13 @@ describe My::SharesController, :type => :controller do
 
       it "should paginate" do          
         FactoryGirl.create(:generic_file).tap do |r|
-          r.apply_depositor_metadata @other_user
-          r.edit_users += [@user.user_key]
+          r.apply_depositor_metadata other_user
+          r.edit_users += [user.user_key]
           r.save!
         end
         FactoryGirl.create(:generic_file).tap do |r|
-          r.apply_depositor_metadata @other_user
-          r.edit_users += [@user.user_key]
+          r.apply_depositor_metadata other_user
+          r.edit_users += [user.user_key]
           r.save!
         end
         get :index, per_page: 2
@@ -51,12 +60,14 @@ describe My::SharesController, :type => :controller do
       it "shows the correct documents" do
         get :index
         # shows documents shared with me
-        expect(assigns[:document_list].map(&:id)).to include(@shared_with_me.id)
+        expect(assigns[:document_list].map(&:id)).to include(shared_with_me.id)
         # doesn't show normal files
-        expect(assigns[:document_list].map(&:id)).to_not include(@my_file.id)
-        expect(assigns[:document_list].map(&:id)).to_not include(@unshared_file.id)
+        expect(assigns[:document_list].map(&:id)).to_not include(my_file.id)
+        expect(assigns[:document_list].map(&:id)).to_not include(unshared_file.id)
         # doesn't show files shared with other users
-        expect(assigns[:document_list].map(&:id)).to_not include(@shared_with_someone_else.id)
+        expect(assigns[:document_list].map(&:id)).to_not include(shared_with_someone_else.id)
+        # doesn't show my collections
+        expect(assigns[:document_list].map(&:id)).to_not include my_collection.id
       end
     end
   end

data/spec/controllers/single_use_links_controller_spec.rb

@@ -4,10 +4,9 @@ describe SingleUseLinksController, :type => :controller do
   let(:user) { FactoryGirl.find_or_create(:jill) }
 
   let(:file) do
-    GenericFile.new.tap do |file|
-      file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+    GenericFile.create do |file|
+      file.add_file(File.open(fixture_path + '/world.png'), path: 'content', original_name: 'world.png')
       file.apply_depositor_metadata(user)
-      file.save
     end
   end
 

data/spec/controllers/single_use_links_viewer_controller_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe SingleUseLinksViewerController do
   let(:file) do
-    GenericFile.new.tap do |file|
-      file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+    GenericFile.create do |file|
+      file.add_file(File.open(fixture_path + '/world.png'), path: 'content', original_name: 'world.png', mime_type: 'image/png')
+      file.label = 'world.png'
       file.apply_depositor_metadata('mjg')
-      file.save!
     end
   end
 
@@ -34,20 +34,16 @@ describe SingleUseLinksViewerController do
         get :download, id: download_link_hash
         expect(response.body).to eq expected_content
         expect(response).to be_success
+        expect { SingleUseLink.find_by_downloadKey!(download_link_hash) }.to raise_error ActiveRecord::RecordNotFound
       end
 
-      it "and_return 404 on second attempt" do
-        get :download, id: download_link_hash
-        expect(response).to be_success
-        get :download, id: download_link_hash
-        expect(response).to render_template('error/single_use_error')
-      end
+      context "and the key is not found" do
+        before { SingleUseLink.find_by_downloadKey!(download_link_hash).destroy }
 
-      it "and_return 404 on attempt to get download with show" do
-        get :download, id: download_link_hash
-        expect(response).to be_success
-        get :show, id:download_link_hash
-        expect(response).to render_template('error/single_use_error')
+        it "returns 404 if the key is not present" do
+          get :download, id: download_link_hash
+          expect(response).to render_template('error/single_use_error')
+        end
       end
     end
 
@@ -56,15 +52,18 @@ describe SingleUseLinksViewerController do
         get 'show', id: show_link_hash
         expect(response).to be_success
         expect(assigns[:asset].id).to eq file.id
+        expect { SingleUseLink.find_by_downloadKey!(show_link_hash) }.to raise_error ActiveRecord::RecordNotFound
       end
 
-      it "and_return 404 on second attempt" do
-        get :show, id: show_link_hash
-        expect(response).to be_success
-        get :show, id: show_link_hash
-        expect(response).to render_template('error/single_use_error')
+      context "and the key is not found" do
+        before { SingleUseLink.find_by_downloadKey!(show_link_hash).destroy }
+        it "returns 404 if the key is not present" do
+          get :show, id: show_link_hash
+          expect(response).to render_template('error/single_use_error')
+        end
       end
-      it "and_return 404 on attempt to get show path with download hash" do
+
+      it "returns 404 on attempt to get show path with download hash" do
         get :show, id: download_link_hash
         expect(response).to render_template('error/single_use_error')
       end

data/spec/controllers/users_controller_spec.rb

@@ -25,9 +25,9 @@ describe UsersController, :type => :controller do
       let(:file1) { GenericFile.create { |f| f.apply_depositor_metadata(user) } }
       let(:file2) { GenericFile.create { |f| f.apply_depositor_metadata(user) } }
       let(:file3) { GenericFile.create { |f| f.apply_depositor_metadata(user) } }
-      let!(:trophy1) { user.trophies.create!(generic_file_id: file1.noid) }
-      let!(:trophy2) { user.trophies.create!(generic_file_id: file2.noid) }
-      let!(:trophy3) { user.trophies.create!(generic_file_id: file3.noid) }
+      let!(:trophy1) { user.trophies.create!(generic_file_id: file1.id) }
+      let!(:trophy2) { user.trophies.create!(generic_file_id: file2.id) }
+      let!(:trophy3) { user.trophies.create!(generic_file_id: file3.id) }
 
       it "show the user profile if user exists" do
         get :show, id: user.user_key
@@ -114,9 +114,9 @@ describe UsersController, :type => :controller do
       let(:file1) { GenericFile.create { |f| f.apply_depositor_metadata(user) } }
       let(:file2) { GenericFile.create { |f| f.apply_depositor_metadata(user) } }
       let(:file3) { GenericFile.create { |f| f.apply_depositor_metadata(user) } }
-      let!(:trophy1) { user.trophies.create!(generic_file_id: file1.noid) }
-      let!(:trophy2) { user.trophies.create!(generic_file_id: file2.noid) }
-      let!(:trophy3) { user.trophies.create!(generic_file_id: file3.noid) }
+      let!(:trophy1) { user.trophies.create!(generic_file_id: file1.id) }
+      let!(:trophy2) { user.trophies.create!(generic_file_id: file2.id) }
+      let!(:trophy3) { user.trophies.create!(generic_file_id: file3.id) }
 
       it "show the user profile if user exists" do
         get :edit, id: user.user_key
@@ -217,11 +217,11 @@ describe UsersController, :type => :controller do
     context "when removing a trophy" do
       let(:file) { GenericFile.create { |f| f.apply_depositor_metadata(user) } }
       before do
-        user.trophies.create!(generic_file_id: file.noid)
+        user.trophies.create!(generic_file_id: file.id)
       end
       it "should remove a trophy" do
         expect {
-          post :update, id: user.user_key,  'remove_trophy_'+file.noid => 'yes'
+          post :update, id: user.user_key,  'remove_trophy_'+file.id => 'yes'
         }.to change { user.trophies.count }.by(-1)
         expect(response).to redirect_to(@routes.url_helpers.profile_path(user.to_param))
         expect(flash[:notice]).to include("Your profile has been updated")