sufia 4.0.0.rc1 → 4.0.0.rc2

data/spec/controllers/users_controller_spec.rb

@@ -5,21 +5,21 @@ describe UsersController do
     @user = FactoryGirl.find_or_create(:jill)
     @another_user = FactoryGirl.find_or_create(:archivist)
     sign_in @user
-    User.any_instance.stub(:groups).and_return([])
-    controller.stub(:clear_session_user) ## Don't clear out the authenticated session
+    allow_any_instance_of(User).to receive(:groups).and_return([])
+    allow(controller).to receive(:clear_session_user) ## Don't clear out the authenticated session
   end
 
   describe "#show" do
     it "show the user profile if user exists" do
       get :show, id: @user.user_key
-      response.should be_success
-      response.should_not redirect_to(root_path)
-      flash[:alert].should be_nil
+      expect(response).to be_success
+      expect(response).to_not redirect_to(root_path)
+      expect(flash[:alert]).to be_nil
     end
     it "redirects to root if user does not exist" do
       get :show, id: 'johndoe666'
-      response.should redirect_to(root_path)
-      flash[:alert].should include ("User 'johndoe666' does not exist")
+      expect(response).to redirect_to(root_path)
+      expect(flash[:alert]).to include ("User 'johndoe666' does not exist")
     end
 
     describe "when the user has trophies" do
@@ -33,8 +33,8 @@ describe UsersController do
 
       it "show the user profile if user exists" do
         get :show, id: user.user_key
-        response.should be_success
-        assigns[:trophies].should match_array([file1, file2, file3])
+        expect(response).to be_success
+        expect(assigns[:trophies]).to match_array([file1, file2, file3])
       end
 
     end
@@ -47,36 +47,36 @@ describe UsersController do
     describe "requesting html" do
       it "should test users" do
         get :index
-        assigns[:users].should include(@u1, @u2)
-        response.should be_successful
+        expect(assigns[:users]).to include(@u1, @u2)
+        expect(response).to be_successful
       end
     end
     describe "requesting json" do
       it "should display users" do
         get :index, format: :json
-        response.should be_successful
+        expect(response).to be_successful
         json = JSON.parse(response.body)
-        json.map{|u| u['id']}.should include(@u1.email, @u2.email)
-        json.map{|u| u['text']}.should include(@u1.email, @u2.email)
+        expect(json.map{|u| u['id']}).to include(@u1.email, @u2.email)
+        expect(json.map{|u| u['text']}).to include(@u1.email, @u2.email)
       end
     end
     describe "query users"  do
       it "finds the expected user via email" do
         get :index,  uq: @u1.email
-        assigns[:users].should include(@u1)
-        assigns[:users].should_not include(@u2)
-        response.should be_successful
+        expect(assigns[:users]).to include(@u1)
+        expect(assigns[:users]).to_not include(@u2)
+        expect(response).to be_successful
       end
       it "finds the expected user via display name" do
         @u1.display_name = "Dr. Curator"
         @u1.save
         @u2.display_name = "Jr. Architect"
         @u2.save
-        User.any_instance.stub(:display_name).and_return("Dr. Curator", "Jr.Archivist")
+        allow_any_instance_of(User).to receive(:display_name).and_return("Dr. Curator", "Jr.Archivist")
         get :index,  uq: @u1.display_name
-        assigns[:users].should include(@u1)
-        assigns[:users].should_not include(@u2)
-        response.should be_successful
+        expect(assigns[:users]).to include(@u1)
+        expect(assigns[:users]).to_not include(@u2)
+        expect(response).to be_successful
         @u1.display_name = nil
         @u1.save
         @u2.display_name = nil
@@ -84,10 +84,10 @@ describe UsersController do
       end
       it "uses the base query" do
         u3 = FactoryGirl.find_or_create(:jill)
-        controller.stub(:base_query).and_return(['email == "jilluser@example.com"'])
+        allow(controller).to receive(:base_query).and_return(['email == "jilluser@example.com"'])
         get :index
-        assigns[:users].should include(u3)
-        assigns[:users].should_not include(@u1, @u2)
+        expect(assigns[:users]).to include(u3)
+        expect(assigns[:users]).to_not include(@u1, @u2)
         u3.destroy
       end
     end
@@ -95,14 +95,14 @@ describe UsersController do
   describe "#edit" do
     it "show edit form when user edits own profile" do
       get :edit, id: @user.user_key
-      response.should be_success
-      response.should render_template('users/edit')
-      flash[:alert].should be_nil
+      expect(response).to be_success
+      expect(response).to render_template('users/edit')
+      expect(flash[:alert]).to be_nil
     end
     it "redirects to show profile when user attempts to edit another profile" do
       get :edit, id: @another_user.user_key
-      response.should redirect_to(@routes.url_helpers.profile_path(@another_user.to_param))
-      flash[:alert].should include("Permission denied: cannot access this page.")
+      expect(response).to redirect_to(@routes.url_helpers.profile_path(@another_user.to_param))
+      expect(flash[:alert]).to include("Permission denied: cannot access this page.")
     end
     describe "when the user has trophies" do
       let(:user) { @user } 
@@ -115,8 +115,8 @@ describe UsersController do
 
       it "show the user profile if user exists" do
         get :edit, id: @user.user_key
-        response.should be_success
-        assigns[:trophies].should match_array([file1, file2, file3])
+        expect(response).to be_success
+        expect(assigns[:trophies]).to match_array([file1, file2, file3])
       end
 
     end
@@ -124,33 +124,33 @@ describe UsersController do
   describe "#update" do
     it "should not allow other users to update" do
       post :update, id: @another_user.user_key, user: { avatar: nil }
-      response.should redirect_to(@routes.url_helpers.profile_path(@another_user.to_param))
-      flash[:alert].should include("Permission denied: cannot access this page.")
+      expect(response).to redirect_to(@routes.url_helpers.profile_path(@another_user.to_param))
+      expect(flash[:alert]).to include("Permission denied: cannot access this page.")
     end
     it "should set an avatar and redirect to profile" do
-      @user.avatar?.should be_false
+      expect(@user.avatar?).to be false
       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')
+      expect(UserEditProfileEventJob).to receive(:new).with(@user.user_key).and_return(s1)
+      expect(Sufia.queue).to receive(:push).with(s1).once
+      f = fixture_file_upload('/1.5mb-avatar.jpg', 'image/jpg')
       post :update, id: @user.user_key, user: { avatar: f }
-      response.should redirect_to(@routes.url_helpers.profile_path(@user.to_param))
-      flash[:notice].should include("Your profile has been updated")
-      User.find_by_user_key(@user.user_key).avatar?.should be_true
+      expect(response).to redirect_to(@routes.url_helpers.profile_path(@user.to_param))
+      expect(flash[:notice]).to include("Your profile has been updated")
+      expect(User.find_by_user_key(@user.user_key).avatar?).to be true
     end
     it "should validate the content type of an avatar" do
-      Sufia.queue.should_receive(:push).never
+      expect(Sufia.queue).to receive(:push).never
       f = fixture_file_upload('/image.jp2', 'image/jp2')
       post :update, id: @user.user_key, user: { avatar: f }
-      response.should redirect_to(@routes.url_helpers.edit_profile_path(@user.to_param))
-      flash[:alert].should include("Avatar You are not allowed to upload \"jp2\" files, allowed types: jpg, jpeg, png, gif, bmp, tif, tiff")
+      expect(response).to redirect_to(@routes.url_helpers.edit_profile_path(@user.to_param))
+      expect(flash[:alert]).to include("Avatar You are not allowed to upload \"jp2\" files, allowed types: jpg, jpeg, png, gif, bmp, tif, tiff")
     end
     it "should validate the size of an avatar" do
       f = fixture_file_upload('/4-20.png', 'image/png')
-      Sufia.queue.should_receive(:push).never
+      expect(Sufia.queue).to receive(:push).never
       post :update, id: @user.user_key, user: { avatar: f }
-      response.should redirect_to(@routes.url_helpers.edit_profile_path(@user.to_param))
-      flash[:alert].should include("Avatar file size must be less than 2MB")
+      expect(response).to redirect_to(@routes.url_helpers.edit_profile_path(@user.to_param))
+      expect(flash[:alert]).to include("Avatar file size must be less than 2MB")
     end
     context "user with existing avatar" do
       before do
@@ -160,36 +160,36 @@ describe UsersController do
       end
       it "should delete an avatar" do
         s1 = double('one')
-        UserEditProfileEventJob.should_receive(:new).with(@user.user_key).and_return(s1)
-        Sufia.queue.should_receive(:push).with(s1).once
-        post :update, id: @user.user_key, delete_avatar: true
-        response.should redirect_to(@routes.url_helpers.profile_path(@user.to_param))
-        flash[:notice].should include("Your profile has been updated")
-        User.find_by_user_key(@user.user_key).avatar?.should be_false
+        expect(UserEditProfileEventJob).to receive(:new).with(@user.user_key).and_return(s1)
+        expect(Sufia.queue).to receive(:push).with(s1).once
+        post :update, id: @user.user_key, user: { remove_avatar: true }
+        expect(response).to redirect_to(@routes.url_helpers.profile_path(@user.to_param))
+        expect(flash[:notice]).to include("Your profile has been updated")
+        expect(User.find_by_user_key(@user.user_key).avatar?).to be false
       end
     end
     it "should refresh directory attributes" do
       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, id: @user.user_key, update_directory: true
-      response.should redirect_to(@routes.url_helpers.profile_path(@user.to_param))
-      flash[:notice].should include("Your profile has been updated")
+      expect(UserEditProfileEventJob).to receive(:new).with(@user.user_key).and_return(s1)
+      expect(Sufia.queue).to receive(:push).with(s1).once
+      expect_any_instance_of(User).to receive(:populate_attributes).once
+      post :update, id: @user.user_key, user: { update_directory: true }
+      expect(response).to redirect_to(@routes.url_helpers.profile_path(@user.to_param))
+      expect(flash[:notice]).to include("Your profile has been updated")
     end
     it "should set an social handles" do
-      @user.twitter_handle.blank?.should be_true
-      @user.facebook_handle.blank?.should be_true
-      @user.googleplus_handle.blank?.should be_true
-      @user.linkedin_handle.blank?.should be_true
+      expect(@user.twitter_handle).to be_blank
+      expect(@user.facebook_handle).to be_blank
+      expect(@user.googleplus_handle).to be_blank
+      expect(@user.linkedin_handle).to be_blank
       post :update, id: @user.user_key, user: { twitter_handle: 'twit', facebook_handle: 'face', googleplus_handle: 'goo', linkedin_handle:"link" }
-      response.should redirect_to(@routes.url_helpers.profile_path(@user.to_param))
-      flash[:notice].should include("Your profile has been updated")
+      expect(response).to redirect_to(@routes.url_helpers.profile_path(@user.to_param))
+      expect(flash[:notice]).to include("Your profile has been updated")
       u = User.find_by_user_key(@user.user_key)
-      u.twitter_handle.should == 'twit'
-      u.facebook_handle.should == 'face'
-      u.googleplus_handle.should == 'goo'
-      u.linkedin_handle.should == 'link'
+      expect(u.twitter_handle).to eq 'twit'
+      expect(u.facebook_handle).to eq 'face'
+      expect(u.googleplus_handle).to eq 'goo'
+      expect(u.linkedin_handle).to eq 'link'
     end
 
     context "when removing a trophy" do
@@ -202,8 +202,8 @@ describe UsersController do
         expect {
           post :update, id: user.user_key,  'remove_trophy_'+file.noid => 'yes'
         }.to change { user.trophies.count }.by(-1)
-        response.should redirect_to(@routes.url_helpers.profile_path(user.to_param))
-        flash[:notice].should include("Your profile has been updated")
+        expect(response).to redirect_to(@routes.url_helpers.profile_path(user.to_param))
+        expect(flash[:notice]).to include("Your profile has been updated")
       end
     end
   end
@@ -213,54 +213,50 @@ describe UsersController do
       @user.unfollow(@another_user) rescue nil
     end
     it "should follow another user if not already following, and log an event" do
-      @user.following?(@another_user).should be_false
+      expect(@user.following?(@another_user)).to be false
       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
+      expect(UserFollowEventJob).to receive(:new).with(@user.user_key, @another_user.user_key).and_return(s1)
+      expect(Sufia.queue).to receive(:push).with(s1).once
       post :follow, id: @another_user.user_key
-      response.should redirect_to(@routes.url_helpers.profile_path(@another_user.to_param))
-      flash[:notice].should include("You are following #{@another_user.user_key}")
+      expect(response).to redirect_to(@routes.url_helpers.profile_path(@another_user.to_param))
+      expect(flash[:notice]).to include("You are following #{@another_user.user_key}")
     end
     it "should redirect to profile if already following and not log an event" 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
+      allow_any_instance_of(User).to receive(:following?).with(@another_user).and_return(true)
+      expect(Sufia.queue).to receive(:push).never
       post :follow, id: @another_user.user_key
-      response.should redirect_to(@routes.url_helpers.profile_path(@another_user.to_param))
-      flash[:notice].should include("You are following #{@another_user.user_key}")
+      expect(response).to redirect_to(@routes.url_helpers.profile_path(@another_user.to_param))
+      expect(flash[:notice]).to 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
+      expect(Sufia.queue).to receive(:push).never
       post :follow, id: @user.user_key
-      response.should redirect_to(@routes.url_helpers.profile_path(@user.to_param))
-      flash[:alert].should include("You cannot follow or unfollow yourself")
+      expect(response).to redirect_to(@routes.url_helpers.profile_path(@user.to_param))
+      expect(flash[:alert]).to include("You cannot follow or unfollow yourself")
     end
   end
   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)
+      allow_any_instance_of(User).to receive(:following?).with(@another_user).and_return(true)
       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
+      expect(UserUnfollowEventJob).to receive(:new).with(@user.user_key, @another_user.user_key).and_return(s1)
+      expect(Sufia.queue).to receive(:push).with(s1).once
       post :unfollow, id: @another_user.user_key
-      response.should redirect_to(@routes.url_helpers.profile_path(@another_user.to_param))
-      flash[:notice].should include("You are no longer following #{@another_user.user_key}")
+      expect(response).to redirect_to(@routes.url_helpers.profile_path(@another_user.to_param))
+      expect(flash[:notice]).to include("You are no longer following #{@another_user.user_key}")
     end
     it "should redirect to profile if not following and not log an event" 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
+      allow(@user).to receive(:following?).with(@another_user).and_return(false)
+      expect(Sufia.queue).to receive(:push).never
       post :unfollow, id: @another_user.user_key
-      response.should redirect_to(@routes.url_helpers.profile_path(@another_user.to_param))
-      flash[:notice].should include("You are no longer following #{@another_user.user_key}")
+      expect(response).to redirect_to(@routes.url_helpers.profile_path(@another_user.to_param))
+      expect(flash[:notice]).to 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
+      expect(Sufia.queue).to receive(:push).never
       post :unfollow, id: @user.user_key
-      response.should redirect_to(@routes.url_helpers.profile_path(@user.to_param))
-      flash[:alert].should include("You cannot follow or unfollow yourself")
+      expect(response).to redirect_to(@routes.url_helpers.profile_path(@user.to_param))
+      expect(flash[:alert]).to include("You cannot follow or unfollow yourself")
     end
   end
   describe "#toggle_trophy" do
@@ -275,18 +271,19 @@ describe UsersController do
      end
      it "should trophy a file" do
       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
+      json = JSON.parse(response.body)
+      expect(json['user_id']).to eq @user.id
+      expect(json['generic_file_id']).to eq @file_id
     end
      it "should not trophy a file for a different user" do
       post :toggle_trophy, {id: @another_user.user_key, file_id: @file_id}
-      response.should_not be_success
+      expect(response).to_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, {id: @another_user.user_key, file_id: @file_id}
-      response.should_not be_success
+      expect(response).to_not be_success
     end
   end
 end

data/spec/factories/generic_files.rb

@@ -18,11 +18,11 @@ FactoryGirl.define do
         end
         initialize_with { new(pid: pid) }
         read_groups ["public"]
-        resource_type "Dissertation"
+        resource_type ["Dissertation"]
         subject %w"lorem ipsum dolor sit amet"
         before(:create) do |gf|
           gf.apply_depositor_metadata "archivist1@example.com"
-          gf.title = "Fake Document Title"
+          gf.title = ["Fake Document Title"]
           gf.label = "fake_document.pdf"
         end
       end

data/spec/factories/users.rb

@@ -13,13 +13,43 @@ FactoryGirl.define do
 
     factory :user_with_mail do
       after(:create) do |user|
-        message = '<span class="batchid ui-helper-hidden">fake_batch_noid</span>You\'ve got mail.'
-        User.batchuser().send_message(user, message, "Sample notification.")
+        # TODO: what is this class for?
+        # <span class="batchid ui-helper-hidden">fake_batch_noid</span>
+        message = BatchMessage.new
+
+        # Create examples of single file successes and failures
+        (1..10).each do |number|
+          file = MockFile.new(number.to_s, "Single File #{number.to_s}")
+          User.batchuser().send_message(user, message.single_success("single-batch-success", file), message.success_subject, sanitize_text = false)
+          User.batchuser().send_message(user, message.single_failure("single-batch-failure", file), message.failure_subject, sanitize_text = false)
+        end
+
+        # Create examples of mulitple file successes and failures
+        files = []
+        (1..50).each do |number|
+          files << MockFile.new(number.to_s, "File #{number.to_s}")
+        end
+        User.batchuser().send_message(user, message.multiple_success("multiple-batch-success", files), message.success_subject, sanitize_text = false)
+        User.batchuser().send_message(user, message.multiple_failure("multiple-batch-failure", files), message.failure_subject, sanitize_text = false)
       end
     end
 
     factory :curator do
       email 'curator1@example.com'
     end
+
+  end
+end
+
+class MockFile
+  attr_accessor :noid, :to_s, :id
+  def initialize id, string
+    self.noid = id
+    self.id = id
+    self.to_s = string
   end
 end
+
+class BatchMessage
+  include Sufia::Messages
+end

data/spec/features/browse_dashboard_files_spec.rb

@@ -20,15 +20,27 @@ describe "Browse Dashboard" do
       visit "dashboard/files"
     end
 
-    it "should show me some files" do
+    it "should display all the necessary information" do
       expect(page).to have_content("Edit File")
       expect(page).to have_content("Download File")
+      expect(page).to_not have_content("Is part of:")
+      first(".label-success") do
+        expect(page).to have_content("Open Access")
+      end
+      expect(page).to have_link("Create Collection")
+      expect(page).to have_link("Upload")
     end
 
-    it "should allow you to search your own files" do
+    it "should allow you to search your own files and remove constraints" do
       fill_in "q", with: "PDF"
       click_button "search-submit-header"
       expect(page).to have_content("Fake Document Title")
+      within(".constraints-container") do
+        expect(page).to have_content("You searched for:")
+        expect(page).to have_css("span.glyphicon-remove")
+        find(".dropdown-toggle").click
+      end
+      expect(page).to have_content("Fake Wav File")
     end
 
     it "should allow you to browse facets" do

data/spec/features/browse_files_spec.rb

@@ -2,9 +2,13 @@ require 'spec_helper'
 
 describe "Browse files" do
 
+  before do
+    allow(User).to receive(:find_by_user_key).and_return(stub_model(User, twitter_handle: 'bob'))
+  end
+
   before(:all) do
     @fixtures = find_or_create_file_fixtures
-    @fixtures[0].tag = "key"
+    @fixtures[0].tag = ["key"]
     (1..25).each do |i|
       @fixtures[0].tag << i
     end