sufia 4.0.0.beta3 → 4.0.0.beta4

data/spec/controllers/{dashboard → my}/shares_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Dashboard::SharesController do
+describe My::SharesController do
   describe "logged in user" do
     before (:each) do
       @user = FactoryGirl.find_or_create(:archivist)
@@ -29,11 +29,6 @@ describe Dashboard::SharesController do
       it "should respond with success" do
         get :index
         expect(response).to be_successful
-        expect(response).to render_template('dashboard/lists/index')
-      end
-
-      it "sets the controller name" do
-        expect(controller.controller_name).to eq :dashboard
       end
 
       it "should paginate" do          
@@ -66,13 +61,4 @@ describe Dashboard::SharesController do
     end
   end
 
-  describe "not logged in as a user" do
-    describe "#index" do
-      it "should return an error" do
-        get :index
-        expect(response).to be_redirect
-      end
-    end
-  end
 end
-

data/spec/controllers/my_controller_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe MyController do
+
+  it "sets the controller name" do
+    expect(controller.controller_name).to eq :my
+  end
+
+end

data/spec/features/browse_dashboard_files_spec.rb

@@ -1,42 +1,88 @@
 require 'spec_helper'
 
-describe "Browse Dashboard files" do
+describe "Browse Dashboard" do
 
   before do
     @fixtures = find_or_create_file_fixtures
     sign_in FactoryGirl.create :user_with_fixtures
   end
 
-  it "should show me some files (from the fixtures)" do
-    click_link "dashboard"
-    click_link "Files"
-    page.should have_content "Edit File"
-    page.should have_content "Download File"
-    fill_in "dashboard_search", with: "PDF"
-    click_button "dashboard_submit"
+  it "should search your files by deafult" do
+    visit "/dashboard"
+    fill_in "q", with: "PDF"
+    click_button "search-submit-header"
     page.should have_content "Fake Document Title"
   end
 
-  it "should allow you to browse facets" do
-    pending "need to fix the 'more' link on facets with more than 5 items"
-    # TODO: fix more facets link!
-    click_link "dashboard"
-    click_link "Files"
-    click_link "more Subjects"
-    click_link "consectetur"
-    within("#document_#{@fixtures[1].noid}") do
-      click_link "Test Document MP3.mp3"
-    end
-    page.should have_content "File Details"
+  context "within my files page" do
+
+    before do
+      visit "dashboard/files"
+    end
+
+    it "should show me some files" do
+      page.should have_content "Edit File"
+      page.should have_content "Download File"
+    end
+
+    it "should allow you to search your own files" do
+      fill_in "q", with: "PDF"
+      click_button "search-submit-header"
+      page.should have_content "Fake Document Title"
+    end
+
+    it "should allow you to browse facets" do
+      pending "Issue #428 is causing this"
+      click_link "more Subjects"
+      click_link "consectetur"
+      save_and_open_page
+      within("#document_#{@fixtures[1].noid}") do
+        click_link "Test Document MP3.mp3"
+      end
+      page.should have_content "File Details"
+    end
+
+    it "should allow me to edit files (from the fixtures)" do
+      fill_in "q", with: "Wav"
+      click_button "search-submit-header"
+      click_button "Select an action"
+      click_link "Edit File"
+      page.should have_content "Edit Fake Wav File.wav"
+    end
+
   end
 
-  it "should allow me to edit files (from the fixtures)" do
-    click_link "dashboard"
-    click_link "Files"
-    fill_in "dashboard_search", with: "Wav"
-    click_button "dashboard_submit"
-    click_link "Edit File"
-    page.should have_content "Edit Fake Wav File.wav"
+  context "within my collections page" do
+    before do
+      visit "dashboard/collections"
+    end
+    it "should search within my collections" do
+      within(".input-group-btn") do
+        page.should have_content("My Collections")
+      end
+    end
+  end
+
+  context "within my highlights page" do
+    before do
+      visit "dashboard/highlights"
+    end
+    it "should search within my highlights" do
+      within(".input-group-btn") do
+        page.should have_content("My Highlights")
+      end
+    end
+  end
+
+  context "within my shares page" do
+    before do
+      visit "dashboard/shares"
+    end
+    it "should search within my shares" do
+      within(".input-group-btn") do
+        page.should have_content("My Shares")
+      end
+    end
   end
 
 end

data/spec/features/collection_spec.rb

@@ -17,7 +17,7 @@ describe 'collection' do
   let(:title2) {"Test Collection 2"}
   let(:description2) {"Description for collection 2 we are testing."}
 
-  let(:user) { FactoryGirl.create(:user, email: 'user1@example.com') }
+  let(:user) { FactoryGirl.find_or_create(:archivist) }
   let(:user_key) { user.user_key }
 
   before(:all) do
@@ -28,7 +28,7 @@ describe 'collection' do
     (0..12).each do |x|
       @gfs[x] =  GenericFile.new.tap do |f|
         f.title = "title #{x}"
-        f.apply_depositor_metadata('user1@example.com')
+        f.apply_depositor_metadata('archivist1@example.com')
         f.save!
       end
     end
@@ -43,7 +43,6 @@ describe 'collection' do
     Collection.destroy_all
   end
 
-
   describe 'create collection' do
     before do
       sign_in user
@@ -79,7 +78,6 @@ describe 'collection' do
         first(".itemtrash").click
       end
       page.should_not have_content(@collection.title)
-      page.should have_content("Dashboard")
     end
   end
 

data/spec/features/display_dashboard_spec.rb

@@ -1,41 +1,35 @@
 require 'spec_helper'
 
-describe "Display Dashboard files" do
+describe "Display User Dashboard" do
 
   before do
     sign_in :user_with_fixtures
+    visit "/dashboard"
   end
 
-  it "should display the dashboard and have search" do
-    click_link 'dashboard'
-    click_link 'Files'
-    fill_in "dashboard_search", with: "dash search"
-    click_button "dashboard_submit"
-    page.should have_content "Dashboard"
-    page.should have_content "You searched for: dash search"
-    find_field("search-field-header").value.should be_nil
+  it "should show the user's information" do
+    page.should have_content "My Dashboard"
+    page.should have_content "User Activity"
+    page.should have_content "User Notifications"
+    page.should have_content "Your Statistics"
   end
 
-  it "should display the dashboard and want to upload files" do
-    click_link 'dashboard'
-    click_link 'Upload File(s)'
+  it "should let the user upload files" do
+    click_link "Upload"
     page.should have_content "Upload"
   end
 
-  it "should display the dashboard and want to search the whole system" do
-    fill_in "search-field-header", with: "system search"
-    click_button "search-submit-header"
-    page.should have_content "You searched for: system search"
-    page.should_not have_content "Dashboard"
-    find_field("search-field-header").value.should match(/system search/)
+  it "should let the user create collections" do
+    click_link "Create Collection"
+    page.should have_content "Create New Collection"
+  end
+
+  it "should let the user view files" do
+    click_link "View Files"
+    page.should have_content "Files"
+    page.should have_content "Collections"
+    page.should have_content "Highlighted"
+    page.should have_content "Shared with Me"
   end
 
-  # @culerity
-  # Scenario: I have files on my dashboard I should see icons 
-  #   #Given I load sufia fixtures
-  #   And I am logged in as "archivist1@example.com"
-  #   And I follow "dashboard"
-  #   Then I should see "Test Document Text"
-  #   When I follow the link within "a[href='/files/test3'].itemtrash"
-  #   Then I should see "The file has been deleted"
 end

data/spec/features/search_spec.rb

@@ -3,20 +3,32 @@ require 'spec_helper'
 describe 'searching' do
   before { GenericFile.destroy_all }
   let!(:file) { FactoryGirl.create(:public_file, title: "Toothbrush") }
-  it "should find the file and have a gallery" do
-    visit '/'
-    fill_in "search-field-header", with: "Toothbrush"
-    click_button "search-submit-header"
-    expect(page).to have_content "1 entry found"
-    within "#search-results" do
-      expect(page).to have_content "Toothbrush"
+
+  context "as a public user" do
+    it "should find the file and have a gallery" do
+      visit '/'
+      fill_in "search-field-header", with: "Toothbrush"
+      click_button "search-submit-header"
+      expect(page).to have_content "1 entry found"
+      within "#search-results" do
+        expect(page).to have_content "Toothbrush"
+      end
+      
+      click_link "Gallery"
+      expect(page).to have_content "You searched for: Toothbrush"
+      within "#documents" do
+        expect(page).to have_content "Toothbrush"
+      end
     end
-    
-    click_link "Gallery"
-    expect(page).to have_content "You searched for: Toothbrush"
-    within "#documents" do
-      expect(page).to have_content "Toothbrush"
+
+    it "should not display search options for dashboard files" do
+      visit "/"
+      within(".input-group-btn") do
+        expect(page).to_not have_content("My Files")
+        expect(page).to_not have_content("My Collections")
+        expect(page).to_not have_content("My Shares")
+      end
     end
+
   end
 end
-

data/spec/helpers/dashboard_helper_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe DashboardHelper do
+  
+  describe "#render_recent_activity" do
+    context "when there is no activity" do
+      it "should return a messages stating the user has no recent activity" do
+        assign(:activity, [])
+        expect(helper.render_recent_activity).to include("no recent activity")
+      end
+    end
+  end
+
+  describe "#render_recent_notifications" do
+    context "when there are no notifications" do
+      it "should return a messages stating the user has no recent notifications" do
+        assign(:notifications, [])
+        expect(helper.render_recent_notifications).to include("no notifications")
+      end
+    end
+  end
+
+  describe "#on_the_dashboard?" do
+    it "should return false for controllers that aren't a part of the dashboard" do
+      allow(helper).to receive(:params).and_return({ controller: "foo" })
+      expect(helper.on_the_dashboard?).to be_false
+    end
+
+    it "should return true for controllers that are part of the dashboard" do
+      allow(helper).to receive(:params).and_return({ controller: "my/files" })
+      expect(helper.on_the_dashboard?).to be_true
+      allow(helper).to receive(:params).and_return({ controller: "my/collections" })
+      expect(helper.on_the_dashboard?).to be_true
+      allow(helper).to receive(:params).and_return({ controller: "my/highlights" })
+      expect(helper.on_the_dashboard?).to be_true
+      allow(helper).to receive(:params).and_return({ controller: "my/shares" })
+      expect(helper.on_the_dashboard?).to be_true
+    end
+  end
+
+end

data/spec/helpers/sufia_helper_spec.rb

@@ -3,7 +3,9 @@ require 'spec_helper'
 describe SufiaHelper do
 
   describe "#link_to_facet_list" do
-    before { helper.stub(blacklight_config: CatalogController.blacklight_config) }
+    before do
+      allow(helper).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)
+    end
 
     context "with values" do
       subject { helper.link_to_facet_list(['car', 'truck'], 'vehicle_type') }
@@ -28,12 +30,12 @@ describe SufiaHelper do
   describe "has_collection_search_parameters?" do
     subject { helper }
     context "when cq is set" do
-      before { helper.stub(params: { cq: 'foo'})  }
+      before { allow(helper).to receive(:params).and_return({ cq: 'foo'}) }
       it { should have_collection_search_parameters }
     end
 
     context "when cq is not set" do
-      before { helper.stub(params: { cq: ''})  }
+      before { allow(helper).to receive(:params).and_return({ cq: ''}) }
       it { should_not have_collection_search_parameters }
     end
   end
@@ -62,4 +64,103 @@ describe SufiaHelper do
       end
     end
   end
+
+  describe "#link_to_telephone" do
+
+    before do
+      @user = mock_model(User)
+      allow(@user).to receive(:telephone).and_return('867-5309')
+    end
+    
+    context "when @user is set" do
+      it "should return a link to the user's telephone" do
+        expect(helper.link_to_telephone).to eq("<a href=\"wtai://wp/mc;867-5309\">867-5309</a>")
+      end
+    end
+
+    context "when @user is not set" do
+      it "should return a link to the user's telephone" do
+        expect(helper.link_to_telephone(@user)).to eq("<a href=\"wtai://wp/mc;867-5309\">867-5309</a>")
+      end
+    end
+  
+  end
+
+  describe "#current_search_parameters" do
+
+    context "when the user is not in the dashboard" do
+      it "should be whatever q is" do
+        allow(helper).to receive(:params).and_return({ controller: "catalog", q: "foo" })
+        expect(helper.current_search_parameters).to eq("foo")
+      end
+    end
+
+    context "when the user is on any dashboard page" do
+
+      it "should be ignored on dashboard" do
+        allow(helper).to receive(:params).and_return({ controller: "dashboard", q: "foo" })
+        expect(helper.current_search_parameters).to be_nil
+      end
+
+      it "should be ignored on dashboard files, collections, highlights and shares" do
+        allow(helper).to receive(:params).and_return({ controller: "my/files", q: "foo" })
+        expect(helper.current_search_parameters).to be_nil
+        allow(helper).to receive(:params).and_return({ controller: "my/collections", q: "foo" })
+        expect(helper.current_search_parameters).to be_nil
+        allow(helper).to receive(:params).and_return({ controller: "my/highlights", q: "foo" })
+        expect(helper.current_search_parameters).to be_nil
+        allow(helper).to receive(:params).and_return({ controller: "my/shares", q: "foo" })
+        expect(helper.current_search_parameters).to be_nil
+      end
+
+    end
+
+  end
+
+  describe "#search_form_action" do
+
+    context "when the user is not in the dashboard" do
+      it "should return the catalog index path" do
+        allow(helper).to receive(:params).and_return({ controller: "foo" })
+        expect(helper.search_form_action).to eq(catalog_index_path)
+      end
+    end
+
+    context "when the user is on the dashboard page" do
+      it "should default to My Files" do
+        allow(helper).to receive(:params).and_return({ controller: "dashboard" })
+        expect(helper.search_form_action).to eq(sufia.dashboard_files_path)
+      end
+    end
+
+    context "when the user is on the my files page" do
+      it "should return the my dashboard files path" do
+        allow(helper).to receive(:params).and_return({ controller: "my/files" })
+        expect(helper.search_form_action).to eq(sufia.dashboard_files_path)
+      end
+    end
+
+    context "when the user is on the my collections page" do
+      it "should return the my dashboard collections path" do
+        allow(helper).to receive(:params).and_return({ controller: "my/collections" })
+        expect(helper.search_form_action).to eq(sufia.dashboard_collections_path)
+      end
+    end
+
+    context "when the user is on the my highlights page" do
+      it "should return the my dashboard highlights path" do
+        allow(helper).to receive(:params).and_return({ controller: "my/highlights" })
+        expect(helper.search_form_action).to eq(sufia.dashboard_highlights_path)
+      end
+    end
+
+    context "when the user is on the my shares page" do
+      it "should return the my dashboard shares path" do
+        allow(helper).to receive(:params).and_return({ controller: "my/shares" })
+        expect(helper.search_form_action).to eq(sufia.dashboard_shares_path)
+      end
+    end
+
+  end
+
 end