sufia 6.2.0 → 6.3.0

data/spec/controllers/api/zotero_controller_spec.rb

@@ -60,13 +60,14 @@ describe API::ZoteroController, type: :controller do
 
       let(:token) { object_double(OAuth::RequestToken.new(client), authorize_url: 'https://www.zotero.org/oauth/authorize?identity=1&oauth_callback=http%3A%2F%2Ftest.host%2Fapi%2Fzotero%2Fcallback&oauth_token=bc2502f2750983c57224') }
       let(:client) do
-        OAuth::Consumer.new(Sufia::Zotero.config['client_key'], Sufia::Zotero.config['client_secret'], {
-          site: 'https://www.zotero.org',
-          scheme: :query_string,
-          http_method: :get,
-          request_token_path: '/oauth/request',
-          access_token_path: '/oauth/access',
-          authorize_path: '/oauth/authorize'})
+        OAuth::Consumer.new(Sufia::Zotero.config['client_key'],
+                            Sufia::Zotero.config['client_secret'],
+                            site: 'https://www.zotero.org',
+                            scheme: :query_string,
+                            http_method: :get,
+                            request_token_path: '/oauth/request',
+                            access_token_path: '/oauth/access',
+                            authorize_path: '/oauth/authorize')
       end
 
       subject { response }
@@ -151,8 +152,8 @@ describe API::ZoteroController, type: :controller do
       let(:pin) { '12345' }
       let(:user_token) do
         double('token',
-          params: { oauth_token: token_string },
-          get_access_token: access_token)
+               params: { oauth_token: token_string },
+               get_access_token: access_token)
       end
       let(:zuserid) { 'myzuser' }
       let(:access_token) do

data/spec/controllers/authorities_controller_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
-describe AuthoritiesController, :type => :controller do
+describe AuthoritiesController, type: :controller do
   describe "#query" do
-    it "should return an array of hashes" do
-      mock_hits = [{label: "English", uri: "http://example.org/eng"},
-                   {label: "Environment", uri: "http://example.org/env"},
-                   {label: "Edge", uri: "http://example.org/edge"},
-                   {label: "Edgar", uri: "http://example.org/edga"},
-                   {label: "Eddie", uri: "http://example.org/edd"},
-                   {label: "Economics", uri: "http://example.org/eco"}]
+    it "returns an array of hashes" do
+      mock_hits = [{ label: "English", uri: "http://example.org/eng" },
+                   { label: "Environment", uri: "http://example.org/env" },
+                   { label: "Edge", uri: "http://example.org/edge" },
+                   { label: "Edgar", uri: "http://example.org/edga" },
+                   { label: "Eddie", uri: "http://example.org/edd" },
+                   { label: "Economics", uri: "http://example.org/eco" }]
       expect(LocalAuthority).to receive(:entries_by_term).and_return(mock_hits)
       xhr :get, :query, model: "generic_files", term: "subject", q: "E"
       expect(response).to be_success

data/spec/controllers/batch_controller_spec.rb

@@ -11,64 +11,63 @@ describe BatchController do
     let(:batch) { Batch.create }
     context "enquing a batch job" do
       before do
-        allow(BatchUpdateJob).to receive(:new).with(user.user_key, batch.id, {'1' => 'foo'},
-                { tag: [] }, 'open').and_return(batch_update_message)
+        allow(BatchUpdateJob).to receive(:new).with(user.user_key, batch.id, { '1' => 'foo' },
+                                                    { tag: [] }, 'open').and_return(batch_update_message)
       end
-      it "should be successful" do
+      it "is successful" do
         expect(Sufia.queue).to receive(:push).with(batch_update_message).once
-        post :update, id: batch.id, title: {'1' => 'foo'}, visibility: 'open', generic_file: { tag: [""] }
+        post :update, id: batch.id, title: { '1' => 'foo' }, visibility: 'open', generic_file: { tag: [""] }
         expect(response).to redirect_to routes.url_helpers.dashboard_files_path
         expect(flash[:notice]).to include("Your files are being processed")
       end
     end
 
     describe "when submiting files on behalf of another user" do
-      let(:somebody_else_file) do 
+      let(:somebody_else_file) do
         f = GenericFile.create(title: ['Original Title']) { |gf| gf.apply_depositor_metadata('current_user') }
         f.on_behalf_of = 'somebody@else.org'
         f.save!
         f
-      end      
+      end
       let(:batch) { Batch.create { |b| b.generic_files.push(somebody_else_file) } }
-      it "should go to my shares page" do
-        post :update, id: batch, "generic_file"=>{"permissions_attributes"=>[{"type" => "group", "name" => "public", "access" => "read"}]}
+      it "goes to my shares page" do
+        post :update, id: batch, "generic_file" => { "permissions_attributes" => [{ "type" => "group", "name" => "public", "access" => "read" }] }
         expect(response).to redirect_to routes.url_helpers.dashboard_shares_path
       end
     end
 
-
     describe "when user has edit permissions on a file" do
-      # TODO all these tests could move to batch_update_job_spec.rb
+      # TODO: all these tests could move to batch_update_job_spec.rb
       let!(:file) { GenericFile.create(batch: batch) { |f| f.apply_depositor_metadata(user) } }
 
-      it "should set the groups" do
-        post :update, id: batch, "generic_file"=>{"permissions_attributes"=>[{"type" => "group", "name" => "public", "access" => "read"}]}
+      it "sets the groups" do
+        post :update, id: batch, "generic_file" => { "permissions_attributes" => [{ "type" => "group", "name" => "public", "access" => "read" }] }
         file.reload
         expect(file.read_groups).to include "public"
         expect(response).to redirect_to routes.url_helpers.dashboard_files_path
       end
 
-      it "should set public read access" do
+      it "sets public read access" do
         post :update, id: batch, visibility: "open", generic_file: { tag: [""] }
         expect(file.reload.read_groups).to eq ['public']
       end
 
-      it "should set metadata like title" do
+      it "sets metadata like title" do
         post :update, id: batch, generic_file: { tag: ["footag", "bartag"] }, title: { file.id => ["New Title"] }
         file.reload
         expect(file.title).to eq ["New Title"]
-        # TODO is order important?
+        # TODO: is order important?
         expect(file.tag).to include("footag", "bartag")
       end
 
-      it "should not set any tags" do
+      it "does not set any tags" do
         post :update, id: batch, generic_file: { tag: [""] }
         expect(file.reload.tag).to be_empty
       end
     end
 
     describe "when user does not have edit permissions on a file" do
-      # TODO all these tests could move to batch_update_job_spec.rb
+      # TODO: all these tests could move to batch_update_job_spec.rb
       let(:file) do
         GenericFile.new(batch: batch, title: ['Original Title']).tap do |f|
           f.apply_depositor_metadata('someone_else')
@@ -76,8 +75,8 @@ describe BatchController do
         end
       end
 
-      it "should not modify the object" do
-        post :update, id: batch, "generic_file"=>{"read_groups_string"=>"group1, group2", "read_users_string"=>"", "tag"=>[""]}, "title"=>{file.id=>"Title Wont Change"}
+      it "does not modify the object" do
+        post :update, id: batch, "generic_file" => { "read_groups_string" => "group1, group2", "read_users_string" => "", "tag" => [""] }, "title" => { file.id => "Title Wont Change" }
         file.reload
         expect(file.title).to eq ["Original Title"]
         expect(file.read_groups).to eq []
@@ -93,7 +92,7 @@ describe BatchController do
     let!(:file) { GenericFile.create(batch: b1, label: 'f1') { |f| f.apply_depositor_metadata(user) } }
     let!(:file2) { GenericFile.create(batch: b1, label: 'f2') { |f| f.apply_depositor_metadata(user) } }
 
-    it "should default creator" do
+    it "defaults creator" do
       get :edit, id: b1
       expect(assigns[:form]).not_to be_persisted
       expect(assigns[:form].creator[0]).to eq user.display_name

data/spec/controllers/batch_edits_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe BatchEditsController, :type => :controller do
+describe BatchEditsController, type: :controller do
   before do
     sign_in FactoryGirl.find_or_create(:jill)
     allow_any_instance_of(User).to receive(:groups).and_return([])
@@ -22,17 +22,17 @@ describe BatchEditsController, :type => :controller do
       expect(controller).to receive(:can?).with(:edit, @two.id).and_return(true)
     end
 
-    it "should be successful" do
+    it "is successful" do
       get :edit
       expect(response).to be_successful
       expect(assigns[:terms]).to eq [:creator, :contributor, :description, :tag, :rights, :publisher,
-                        :date_created, :subject, :language, :identifier, :based_near, :related_url]
+                                     :date_created, :subject, :language, :identifier, :based_near, :related_url]
       expect(assigns[:generic_file].creator).to eq ["Fred", "Wilma"]
       expect(assigns[:generic_file].publisher).to eq ["Rand McNally"]
       expect(assigns[:generic_file].language).to eq ["en"]
     end
 
-    it "should set the breadcrumb trail" do
+    it "sets the breadcrumb trail" do
       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)
       get :edit
@@ -60,31 +60,30 @@ describe BatchEditsController, :type => :controller do
 
     let(:mycontroller) { "my/files" }
 
-    it "should be successful" do
+    it "is successful" do
       put :update, update_type: "delete_all"
       expect(response).to redirect_to(Sufia::Engine.routes.url_for(controller: "dashboard", only_path: true))
       expect { GenericFile.find(one.id) }.to raise_error(Ldp::Gone)
       expect { GenericFile.find(two.id) }.to raise_error(Ldp::Gone)
     end
 
-    it "should redirect to the return controller" do
+    it "redirects to the return controller" do
       put :update, update_type: "delete_all", return_controller: mycontroller
       expect(response).to redirect_to(Sufia::Engine.routes.url_for(controller: mycontroller, only_path: true))
     end
 
-    it "should update the records" do
+    it "updates the records" do
       put :update, update_type: "update", generic_file: { subject: ["zzz"] }
       expect(response).to be_redirect
       expect(GenericFile.find(one.id).subject).to eq ["zzz"]
       expect(GenericFile.find(two.id).subject).to eq ["zzz"]
     end
 
-    it "should update permissions" do
+    it "updates permissions" do
       put :update, update_type: "update", visibility: "authenticated"
       expect(response).to be_redirect
       expect(GenericFile.find(one.id).visibility).to eq "authenticated"
       expect(GenericFile.find(two.id).visibility).to eq "authenticated"
     end
   end
-
 end

data/spec/controllers/catalog_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe CatalogController, :type => :controller do
+describe CatalogController, type: :controller do
   routes { Rails.application.class.routes }
 
   let(:user) { FactoryGirl.find_or_create(:jill) }
@@ -40,7 +40,7 @@ describe CatalogController, :type => :controller do
     end
 
     describe "term search" do
-      it "should find records" do
+      it "finds records" do
         get :index, q: "pdf", owner: 'all'
         expect(response).to be_success
         expect(response).to render_template('catalog/index')
@@ -55,7 +55,7 @@ describe CatalogController, :type => :controller do
         # TODO: this is not how a facet query is done.
         get :index, q: "{f=contributor_tesim}Contrib1"
       end
-      it "should find facet files" do
+      it "finds facet files" do
         expect(response).to be_success
         expect(response).to render_template('catalog/index')
         expect(assigns(:document_list).count).to eq 1
@@ -64,10 +64,10 @@ describe CatalogController, :type => :controller do
 
     context "with collections" do
       before do
-       @collection = Collection.new(title:"my collection", tag: ['rocks'], read_groups: ['public']).tap do |c|
-         c.apply_depositor_metadata('mjg36')
-         c.save!
-       end
+        @collection = Collection.new(title: "my collection", tag: ['rocks'], read_groups: ['public']).tap do |c|
+          c.apply_depositor_metadata('mjg36')
+          c.save!
+        end
       end
 
       it "finds collections and files" do
@@ -76,8 +76,6 @@ describe CatalogController, :type => :controller do
         doc_list = assigns(:document_list)
         expect(doc_list.map(&:id)).to match_array [@collection.id, @gf1.id]
       end
-
     end
-
   end
 end

data/spec/controllers/collections_controller_spec.rb

@@ -13,7 +13,7 @@ describe CollectionsController do
       sign_in user
     end
 
-    it 'should assign @collection' do
+    it 'assigns @collection' do
       get :new
       expect(assigns(:collection)).to be_kind_of(Collection)
     end
@@ -24,54 +24,53 @@ describe CollectionsController do
       sign_in user
     end
 
-    it "should create a Collection" do
-      expect {
-        post :create, collection: {title: "My First Collection ", description: "The Description\r\n\r\nand more"}
-      }.to change{ Collection.count }.by(1)
+    it "creates a Collection" do
+      expect do
+        post :create, collection: { title: "My First Collection ", description: "The Description\r\n\r\nand more" }
+      end.to change { Collection.count }.by(1)
     end
 
-    it "should remove blank strings from params before creating Collection" do
-      expect {
+    it "removes blank strings from params before creating Collection" do
+      expect do
         post :create, collection: {
           title: "My First Collection ", creator: [""] }
-      }.to change{ Collection.count }.by(1)
+      end.to change { Collection.count }.by(1)
       expect(assigns[:collection].title).to eq("My First Collection ")
       expect(assigns[:collection].creator).to eq([])
     end
 
-    it "should create a Collection with files I can access" do
+    it "creates a Collection with files I can access" do
       @asset1 = GenericFile.new(title: ["First of the Assets"])
       @asset1.apply_depositor_metadata(user.user_key)
       @asset1.save
       @asset2 = GenericFile.new(title: ["Second of the Assets"], depositor: user.user_key)
       @asset2.apply_depositor_metadata(user.user_key)
       @asset2.save
-      @asset3 = GenericFile.new(title: ["Third of the Assets"], depositor:'abc')
+      @asset3 = GenericFile.new(title: ["Third of the Assets"], depositor: 'abc')
       @asset3.apply_depositor_metadata('abc')
       @asset3.save
-      expect {
+      expect do
         post :create, collection: { title: "My own Collection", description: "The Description\r\n\r\nand more" },
-          batch_document_ids: [@asset1.id, @asset2.id, @asset3.id]
-      }.to change{ Collection.count }.by(1)
+                      batch_document_ids: [@asset1.id, @asset2.id, @asset3.id]
+      end.to change { Collection.count }.by(1)
       collection = assigns(:collection)
       expect(collection.members).to match_array [@asset1, @asset2]
     end
 
-    it "should add docs to the collection if a batch id is provided and add the collection id to the documents in the collection" do
+    it "adds docs to the collection if a batch id is provided and add the collection id to the documents in the collection" do
       @asset1 = GenericFile.new(title: ["First of the Assets"])
       @asset1.apply_depositor_metadata(user.user_key)
       @asset1.save
       post :create, batch_document_ids: [@asset1.id],
-        collection: { title: "My Second Collection ", description: "The Description\r\n\r\nand more" }
+                    collection: { title: "My Second Collection ", description: "The Description\r\n\r\nand more" }
       expect(assigns[:collection].members).to eq [@asset1]
-      asset_results = ActiveFedora::SolrService.instance.conn.get "select", params:{fq:["id:\"#{@asset1.id}\""],fl:['id',Solrizer.solr_name(:collection)]}
+      asset_results = ActiveFedora::SolrService.instance.conn.get "select", params: { fq: ["id:\"#{@asset1.id}\""], fl: ['id', Solrizer.solr_name(:collection)] }
       expect(asset_results["response"]["numFound"]).to eq 1
       doc = asset_results["response"]["docs"].first
       expect(doc["id"]).to eq @asset1.id
       afterupdate = GenericFile.find(@asset1.id)
       expect(doc[Solrizer.solr_name(:collection)]).to eq afterupdate.to_solr[Solrizer.solr_name(:collection)]
     end
-
   end
 
   describe "#update" do
@@ -91,23 +90,23 @@ describe CollectionsController do
         @asset2 = GenericFile.new(title: ["Second of the Assets"], depositor: user.user_key)
         @asset2.apply_depositor_metadata(user.user_key)
         @asset2.save
-        @asset3 = GenericFile.new(title: ["Third of the Assets"], depositor:'abc')
+        @asset3 = GenericFile.new(title: ["Third of the Assets"], depositor: 'abc')
         @asset3.apply_depositor_metadata(user.user_key)
         @asset3.save
       end
 
-      it "should set collection on members" do
-        put :update, id: collection, collection: {members:"add"}, batch_document_ids: [@asset3.id, @asset1.id, @asset2.id]
+      it "sets 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)
         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)]}
+        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
         doc = asset_results["response"]["docs"].first
         expect(doc["id"]).to eq @asset2.id
         afterupdate = GenericFile.find(@asset2.id)
         expect(doc[Solrizer.solr_name(:collection)]).to eq afterupdate.to_solr[Solrizer.solr_name(:collection)]
-        put :update, id: collection, collection: {members:"remove"}, batch_document_ids: [@asset2]
-        asset_results = ActiveFedora::SolrService.instance.conn.get "select", params:{fq:["id:\"#{@asset2.id}\""],fl:['id',Solrizer.solr_name(:collection)]}
+        put :update, id: collection, collection: { members: "remove" }, batch_document_ids: [@asset2]
+        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
         doc = asset_results["response"]["docs"].first
         expect(doc["id"]).to eq @asset2.id
@@ -117,19 +116,18 @@ describe CollectionsController do
     end
 
     context "updating a collections metadata" do
-      it "should save the metadata" do
+      it "saves the metadata" do
         put :update, id: collection, collection: { creator: ['Emily'] }
         collection.reload
         expect(collection.creator).to eq ['Emily']
       end
 
-      it "should remove blank strings from params before updating Collection metadata" do
+      it "removes blank strings from params before updating Collection metadata" do
         put :update, id: collection, collection: {
           title: "My Next Collection ", creator: [""] }
         expect(assigns[:collection].title).to eq("My Next Collection ")
         expect(assigns[:collection].creator).to eq([])
       end
-
     end
   end
 
@@ -152,14 +150,14 @@ describe CollectionsController do
 
     let(:collection) do
       Collection.create(title: "My collection",
-        description: "My incredibly detailed description of the collection",
-        members: [asset1, asset2, asset3]) { |c| c.apply_depositor_metadata(user) }
+                        description: "My incredibly detailed description of the collection",
+                        members: [asset1, asset2, asset3]) { |c| c.apply_depositor_metadata(user) }
     end
 
     context "when signed in" do
       before { sign_in user }
 
-      it "should return the collection and its members" do
+      it "returns the collection and its members" do
         expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.dashboard.title'), Sufia::Engine.routes.url_helpers.dashboard_index_path)
         get :show, id: collection
         expect(response).to be_successful
@@ -170,7 +168,7 @@ describe CollectionsController do
     end
 
     context "not signed in" do
-      it "should not show me files in the collection" do
+      it "does not show me files in the collection" do
         get :show, id: collection
         expect(assigns[:member_docs].count).to eq 0
       end
@@ -180,14 +178,14 @@ describe CollectionsController do
   describe "#edit" do
     let(:collection) do
       Collection.create(title: "My collection",
-        description: "My incredibly detailed description of the collection") do |c|
+                        description: "My incredibly detailed description of the collection") do |c|
         c.apply_depositor_metadata(user)
       end
     end
 
     before { sign_in user }
 
-    it "should not show flash" do
+    it "does not show flash" do
       get :edit, id: collection
       expect(flash[:notice]).to be_nil
     end

data/spec/controllers/content_blocks_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ContentBlocksController, :type => :controller do
+describe ContentBlocksController, type: :controller do
   describe "#update" do
     let(:content_block) { FactoryGirl.create(:content_block) }
     before { request.env["HTTP_REFERER"] = "whence_i_came" }
@@ -36,7 +36,7 @@ describe ContentBlocksController, :type => :controller do
       before { allow(controller).to receive_messages(current_user: user) }
 
       context "as a user in the admin group" do
-        before { expect(user).to receive(:groups).and_return( ['admin', 'registered']) }
+        before { expect(user).to receive(:groups).and_return(['admin', 'registered']) }
 
         it "UPDATE should save" do
           patch :update, id: content_block, content_block: { value: 'foo' }
@@ -45,9 +45,9 @@ describe ContentBlocksController, :type => :controller do
         end
 
         it "CREATE should save" do
-          expect {
+          expect do
             post :create, content_block: { name: 'NNN', value: 'VVV', external_key: 'key' }
-          }.to change { ContentBlock.count}.by(1)
+          end.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'