sufia 2.0.1 → 3.0.0

data/spec/controllers/batch_edits_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe BatchEditsController do
   before do

data/spec/controllers/catalog_controller_spec.rb

@@ -1,18 +1,4 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe CatalogController do
   before do

data/spec/controllers/dashboard_controller_spec.rb

@@ -1,18 +1,4 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe DashboardController do
   before do
@@ -63,14 +49,34 @@ describe DashboardController do
     describe "#index" do
       before (:each) do
         xhr :get, :index
+        # Make sure there are at least 3 files owned by @user. Otherwise, the tests aren't meaningful.
+        if assigns(:document_list).count < 3
+          files_count = assigns(:document_list).count
+          until files_count == 3
+            gf = GenericFile.new()
+            gf.apply_depositor_metadata(@user.user_key)
+            gf.save
+            files_count += 1
+          end
+          xhr :get, :index
+        end
       end
       it "should be a success" do
         response.should be_success
         response.should render_template('dashboard/index')
       end
       it "should return an array of documents I can edit" do
-        user_results = Blacklight.solr.get "select", :params=>{:fq=>["edit_access_group_ssim:public OR edit_access_person_ssim:#{@user.user_key}"]}
-        assigns(:document_list).count.should eql(user_results["response"]["numFound"])
+        editable_docs_response = Blacklight.solr.get "select", :params=>{:fq=>["edit_access_group_ssim:public OR edit_access_person_ssim:#{@user.user_key}"]}
+        assigns(:result_set_size).should eql(editable_docs_response["response"]["numFound"])
+        assigns(:document_list).each {|doc| doc.should be_kind_of SolrDocument}
+      end
+      context "with render views" do
+        render_views
+        it "should paginate" do          
+          xhr :get, :index, per_page: 2
+          response.should be_success
+          response.should render_template('dashboard/index')
+        end
       end
     end
   end

data/spec/controllers/downloads_controller_spec.rb

@@ -1,18 +1,4 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe DownloadsController do
 

data/spec/controllers/generic_files_controller_spec.rb

@@ -1,18 +1,4 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe GenericFilesController do
   before do
@@ -46,11 +32,11 @@ describe GenericFilesController do
 
     it "should spawn a content deposit event job" do
       file = fixture_file_upload('/world.png','image/png')
-      s1 = stub('one')
+      s1 = double('one')
       ContentDepositEventJob.should_receive(:new).with('test:123', 'jilluser@example.com').and_return(s1)
       Sufia.queue.should_receive(:push).with(s1).once
 
-      s2 = stub('one')
+      s2 = double('one')
       CharacterizeJob.should_receive(:new).with('test:123').and_return(s2)
       Sufia.queue.should_receive(:push).with(s2).once
       xhr :post, :create, :files=>[file], :Filename=>"The world", :batch_id => "sample:batch_id", :permission=>{"group"=>{"public"=>"read"} }, :terms_of_service => '1'
@@ -58,15 +44,15 @@ describe GenericFilesController do
 
     it "should expand zip files" do
       file = fixture_file_upload('/icons.zip','application/zip')
-      s1 = stub('one')
+      s1 = double('one')
       ContentDepositEventJob.should_receive(:new).with('test:123', 'jilluser@example.com').and_return(s1)
       Sufia.queue.should_receive(:push).with(s1).once
 
-      s2 = stub('one')
+      s2 = double('one')
       CharacterizeJob.should_receive(:new).with('test:123').and_return(s2)
       Sufia.queue.should_receive(:push).with(s2).once
 
-      s3 = stub('one')
+      s3 = double('one')
       UnzipJob.should_receive(:new).with('test:123').and_return(s3)
       Sufia.queue.should_receive(:push).with(s3).once
 
@@ -173,11 +159,11 @@ describe GenericFilesController do
       controller.should_receive(:virus_check).and_return(0)      
       file = fixture_file_upload('/world.png','image/png')
 
-      s1 = stub('one')
+      s1 = double('one')
       ContentDepositEventJob.should_receive(:new).with('test:123', 'jilluser@example.com').and_return(s1)
       Sufia.queue.should_receive(:push).with(s1).once
 
-      s2 = stub('one')
+      s2 = double('one')
       CharacterizeJob.should_receive(:new).with('test:123').and_return(s2)
       Sufia.queue.should_receive(:push).with(s2).once
       xhr :post, :create, :files=>[file], :Filename=>"The world", :batch_id => "sample:batch_id", :permission=>{"group"=>{"public"=>"read"} }, :terms_of_service=>"1"
@@ -253,7 +239,7 @@ describe GenericFilesController do
       lambda { GenericFile.find(@generic_file.pid) }.should raise_error(ActiveFedora::ObjectNotFoundError)
     end
     it "should spawn a content delete event job" do
-      s1 = stub('one')
+      s1 = double('one')
       ContentDeleteEventJob.should_receive(:new).with(@generic_file.noid, @user.user_key).and_return(s1)
       Sufia.queue.should_receive(:push).with(s1).once
       delete :destroy, :id=>@generic_file.pid
@@ -272,7 +258,7 @@ describe GenericFilesController do
     end
 
     it "should spawn a content update event job" do
-      s1 = stub('one')
+      s1 = double('one')
       ContentUpdateEventJob.should_receive(:new).with(@generic_file.pid, 'jilluser@example.com').and_return(s1)
       Sufia.queue.should_receive(:push).with(s1).once
       @user = FactoryGirl.find_or_create(:user)
@@ -282,10 +268,10 @@ describe GenericFilesController do
     end
 
     it "should spawn a content new version event job" do
-      s1 = stub('one')
+      s1 = double('one')
       ContentNewVersionEventJob.should_receive(:new).with(@generic_file.pid, 'jilluser@example.com').and_return(s1)
       Sufia.queue.should_receive(:push).with(s1).once
-      s2 = stub('one')
+      s2 = double('one')
       CharacterizeJob.should_receive(:new).with(@generic_file.pid).and_return(s2)
       Sufia.queue.should_receive(:push).with(s2).once
       @user = FactoryGirl.find_or_create(:user)
@@ -346,11 +332,11 @@ describe GenericFilesController do
 
       ContentUpdateEventJob.should_receive(:new).with(@generic_file.pid, 'jilluser@example.com').never
 
-      s1 = stub('one')
+      s1 = double('one')
       ContentNewVersionEventJob.should_receive(:new).with(@generic_file.pid, archivist.user_key).and_return(s1)
       Sufia.queue.should_receive(:push).with(s1).once
 
-      s2 = stub('one')
+      s2 = double('one')
       CharacterizeJob.should_receive(:new).with(@generic_file.pid).and_return(s2)
       Sufia.queue.should_receive(:push).with(s2).once
       file = fixture_file_upload('/image.jp2','image/jp2')
@@ -365,11 +351,11 @@ describe GenericFilesController do
       controller.stub(:current_user).and_return(@user)
       sign_in @user
       ContentUpdateEventJob.should_receive(:new).with(@generic_file.pid, 'jilluser@example.com').never
-      s1 = stub('one')
+      s1 = double('one')
       ContentRestoredVersionEventJob.should_receive(:new).with(@generic_file.pid, @user.user_key, 'content.0').and_return(s1)
       Sufia.queue.should_receive(:push).with(s1).once
 
-      s2 = stub('one')
+      s2 = double('one')
       CharacterizeJob.should_receive(:new).with(@generic_file.pid).and_return(s2)
       Sufia.queue.should_receive(:push).with(s2).once
       post :update, :id=>@generic_file.pid, :revision=>'content.0'
@@ -398,11 +384,11 @@ describe GenericFilesController do
     it "should spawn a virus check" do
       # The expectation is in the begin block
       controller.should_receive(:virus_check).and_return(0)      
-      s1 = stub('one')
+      s1 = double('one')
       ContentNewVersionEventJob.should_receive(:new).with(@generic_file.pid, 'jilluser@example.com').and_return(s1)
       Sufia.queue.should_receive(:push).with(s1).once
 
-      s2 = stub('one')
+      s2 = double('one')
       CharacterizeJob.should_receive(:new).with(@generic_file.pid).and_return(s2)
       Sufia.queue.should_receive(:push).with(s2).once
       GenericFile.stub(:save).and_return({})

data/spec/controllers/mailbox_controller_spec.rb

@@ -1,18 +1,4 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe MailboxController do
   before(:each) do

data/spec/controllers/single_use_link_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe SingleUseLinkController do
   before(:all) do
@@ -14,7 +14,7 @@ describe SingleUseLinkController do
     @file2.save
   end
   after(:all) do
-    SingleUseLink.find(:all).each{ |l| l.delete}
+    SingleUseLink.delete_all
     @user.delete
     @file.delete
     @file2.delete
@@ -70,13 +70,8 @@ describe SingleUseLinkController do
   end
   describe "retrieval links" do
     before (:each) do
-      @user = FactoryGirl.find_or_create(:user)
-      sign_in @user
-      get 'generate_download', id:@file.pid
-      @dhash =  assigns[:su].downloadKey
-      get 'generate_show', id:@file.pid
-      @shash=  assigns[:su].downloadKey
-      sign_out @user
+      @dhash = SingleUseLink.create_download(@file.pid).downloadKey
+      @shash = SingleUseLink.create_show(@file.pid).downloadKey
     end    
     before (:each) do
       @user.delete
@@ -116,10 +111,8 @@ describe SingleUseLinkController do
         get :show, id:@shash
         response.should render_template('error/single_use_error')
       end
-      it "and_return 404 on attempt to get show with download" do
-        get :show, id:@shash
-        response.should be_success
-        get :show, id:@shash
+      it "and_return 404 on attempt to get show path with download hash" do
+        get :show, id:@dhash
         response.should render_template('error/single_use_error')
       end
     end

data/spec/controllers/users_controller_spec.rb

@@ -1,18 +1,4 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe UsersController do
   before(:each) do
@@ -30,13 +16,13 @@ describe UsersController do
   end
   describe "#show" do
     it "show the user profile if user exists" do
-      get :show, uid: @user.user_key
+      get :show, id: @user.user_key
       response.should be_success
       response.should_not redirect_to(root_path)
       flash[:alert].should be_nil
     end
     it "redirects to root if user does not exist" do
-      get :show, uid: 'johndoe666'
+      get :show, id: 'johndoe666'
       response.should redirect_to(root_path)
       flash[:alert].should include ("User 'johndoe666' does not exist")
     end
@@ -65,30 +51,30 @@ describe UsersController do
   end
   describe "#edit" do
     it "show edit form when user edits own profile" do
-      get :edit, uid: @user.user_key
+      get :edit, id: @user.user_key
       response.should be_success
       response.should render_template('users/edit')
       flash[:alert].should be_nil
     end
     it "redirects to show profile when user attempts to edit another profile" do
-      get :edit, uid: @another_user.user_key
+      get :edit, id: @another_user.user_key
       response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@another_user.user_key,'@.')))
       flash[:alert].should include("Permission denied: cannot access this page.")
     end
   end
   describe "#update" do
     it "should not allow other users to update" do
-      post :update, uid: @another_user.user_key, user: { avatar: nil }
+      post :update, id: @another_user.user_key, user: { avatar: nil }
       response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@another_user.user_key,'@.')))
       flash[:alert].should include("Permission denied: cannot access this page.")
     end
     it "should set an avatar and redirect to profile" do
       @user.avatar.file?.should be_false
-      s1 = stub('one')
+      s1 = double('one')
       UserEditProfileEventJob.should_receive(:new).with(@user.user_key).and_return(s1)
       Sufia.queue.should_receive(:push).with(s1).once
       f = fixture_file_upload('/world.png', 'image/png')
-      post :update, uid: @user.user_key, user: { avatar: f }
+      post :update, id: @user.user_key, user: { avatar: f }
       response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@user.user_key,'@.')))
       flash[:notice].should include("Your profile has been updated")
       User.find_by_user_key(@user.user_key).avatar.file?.should be_true
@@ -97,7 +83,7 @@ describe UsersController do
       #Resque.should_receive(:enqueue).with(UserEditProfileEventJob, @user.user_key).never
       Sufia.queue.should_receive(:push).never
       f = fixture_file_upload('/image.jp2', 'image/jp2')
-      post :update, uid: @user.user_key, user: { avatar: f }
+      post :update, id: @user.user_key, user: { avatar: f }
       response.should redirect_to(@routes.url_helpers.edit_profile_path(URI.escape(@user.user_key,'@.')))
       flash[:alert].should include("Avatar content type is invalid")
     end
@@ -105,25 +91,25 @@ describe UsersController do
       f = fixture_file_upload('/4-20.png', 'image/png')
       #Resque.should_receive(:enqueue).with(UserEditProfileEventJob, @user.user_key).never
       Sufia.queue.should_receive(:push).never
-      post :update, uid: @user.user_key, user: { avatar: f }
+      post :update, id: @user.user_key, user: { avatar: f }
       response.should redirect_to(@routes.url_helpers.edit_profile_path(URI.escape(@user.user_key,'@.')))
       flash[:alert].should include("Avatar file size must be less than 2097152 Bytes")
     end
     it "should delete an avatar" do
-      s1 = stub('one')
+      s1 = double('one')
       UserEditProfileEventJob.should_receive(:new).with(@user.user_key).and_return(s1)
       Sufia.queue.should_receive(:push).with(s1).once
-      post :update, uid: @user.user_key, delete_avatar: true
+      post :update, id: @user.user_key, delete_avatar: true
       response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@user.user_key,'@.')))
       flash[:notice].should include("Your profile has been updated")
       @user.avatar.file?.should be_false
     end
     it "should refresh directory attributes" do
-      s1 = stub('one')
+      s1 = double('one')
       UserEditProfileEventJob.should_receive(:new).with(@user.user_key).and_return(s1)
       Sufia.queue.should_receive(:push).with(s1).once
       User.any_instance.should_receive(:populate_attributes).once
-      post :update, uid: @user.user_key, update_directory: true
+      post :update, id: @user.user_key, update_directory: true
       response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@user.user_key,'@.')))
       flash[:notice].should include("Your profile has been updated")
     end
@@ -131,7 +117,7 @@ describe UsersController do
       @user.twitter_handle.blank?.should be_true
       @user.facebook_handle.blank?.should be_true
       @user.googleplus_handle.blank?.should be_true
-      post :update, uid: @user.user_key, user: { twitter_handle: 'twit', facebook_handle: 'face', googleplus_handle: 'goo' }
+      post :update, id: @user.user_key, user: { twitter_handle: 'twit', facebook_handle: 'face', googleplus_handle: 'goo' }
       response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@user.user_key,'@.')))
       flash[:notice].should include("Your profile has been updated")
       u = User.find_by_user_key(@user.user_key)
@@ -146,7 +132,7 @@ describe UsersController do
       file_id = f.pid.split(":").last
       Trophy.create(:generic_file_id => file_id, :user_id => @user.id)
       @user.trophy_ids.length.should == 1
-      post :update, uid: @user.user_key,  'remove_trophy_'+file_id=> 'yes' 
+      post :update, id: @user.user_key,  'remove_trophy_'+file_id=> 'yes' 
       response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@user.user_key,'@.')))
       flash[:notice].should include("Your profile has been updated")
       @user.trophy_ids.length.should == 0
@@ -159,10 +145,10 @@ describe UsersController do
     end
     it "should follow another user if not already following, and log an event" do
       @user.following?(@another_user).should be_false
-      s1 = stub('one')
+      s1 = double('one')
       UserFollowEventJob.should_receive(:new).with(@user.user_key, @another_user.user_key).and_return(s1)
       Sufia.queue.should_receive(:push).with(s1).once
-      post :follow, uid: @another_user.user_key
+      post :follow, id: @another_user.user_key
       response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@another_user.user_key,'@.')))
       flash[:notice].should include("You are following #{@another_user.user_key}")
     end
@@ -170,14 +156,14 @@ describe UsersController do
       User.any_instance.stub(:following?).with(@another_user).and_return(true)
       #Resque.should_receive(:enqueue).with(UserFollowEventJob, @user.user_key, @another_user.user_key).never
       Sufia.queue.should_receive(:push).never
-      post :follow, uid: @another_user.user_key
+      post :follow, id: @another_user.user_key
       response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@another_user.user_key,'@.')))
       flash[:notice].should include("You are following #{@another_user.user_key}")
     end
     it "should redirect to profile if user attempts to self-follow and not log an event" do
       #Resque.should_receive(:enqueue).with(UserFollowEventJob, @user.user_key, @user.user_key).never
       Sufia.queue.should_receive(:push).never
-      post :follow, uid: @user.user_key
+      post :follow, id: @user.user_key
       response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@user.user_key,'@.')))
       flash[:alert].should include("You cannot follow or unfollow yourself")
     end
@@ -185,10 +171,10 @@ describe UsersController do
   describe "#unfollow" do
     it "should unfollow another user if already following, and log an event" do
       User.any_instance.stub(:following?).with(@another_user).and_return(true)
-      s1 = stub('one')
+      s1 = double('one')
       UserUnfollowEventJob.should_receive(:new).with(@user.user_key, @another_user.user_key).and_return(s1)
       Sufia.queue.should_receive(:push).with(s1).once
-      post :unfollow, uid: @another_user.user_key
+      post :unfollow, id: @another_user.user_key
       response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@another_user.user_key,'@.')))
       flash[:notice].should include("You are no longer following #{@another_user.user_key}")
     end
@@ -196,14 +182,14 @@ describe UsersController do
       @user.stub(:following?).with(@another_user).and_return(false)
       #Resque.should_receive(:enqueue).with(UserUnfollowEventJob, @user.user_key, @another_user.user_key).never
       Sufia.queue.should_receive(:push).never
-      post :unfollow, uid: @another_user.user_key
+      post :unfollow, id: @another_user.user_key
       response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@another_user.user_key,'@.')))
       flash[:notice].should include("You are no longer following #{@another_user.user_key}")
     end
     it "should redirect to profile if user attempts to self-follow and not log an event" do
       #Resque.should_receive(:enqueue).with(UserUnfollowEventJob, @user.user_key, @user.user_key).never
       Sufia.queue.should_receive(:push).never
-      post :unfollow, uid: @user.user_key
+      post :unfollow, id: @user.user_key
       response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@user.user_key,'@.')))
       flash[:alert].should include("You cannot follow or unfollow yourself")
     end
@@ -219,18 +205,18 @@ describe UsersController do
        @file.delete
      end
      it "should trophy a file" do
-      post :toggle_trophy, {uid: @user.user_key, file_id: @file_id}
+      post :toggle_trophy, {id: @user.user_key, file_id: @file_id}
       JSON.parse(response.body)['user_id'].should == @user.id
       JSON.parse(response.body)['generic_file_id'].should == @file_id
     end
      it "should not trophy a file for a different user" do
-      post :toggle_trophy, {uid: @another_user.user_key, file_id: @file_id}
+      post :toggle_trophy, {id: @another_user.user_key, file_id: @file_id}
       response.should_not be_success
     end
      it "should not trophy a file with no edit privs" do
       sign_out @user
       sign_in @another_user
-      post :toggle_trophy, {uid: @another_user.user_key, file_id: @file_id}
+      post :toggle_trophy, {id: @another_user.user_key, file_id: @file_id}
       response.should_not be_success
     end
   end