sufia 4.0.0.beta2 → 4.0.0.beta3

data/spec/models/local_authority_spec.rb

@@ -26,23 +26,23 @@ describe LocalAuthority do
   end
   it "should harvest an RDF/XML vocab (w/ an alt predicate)" do
     LocalAuthority.harvest_rdf("langs", @rdfxml, 
-                               :format => 'rdfxml',
-                               :predicate => RDF::URI("http://www.w3.org/2008/05/skos#prefLabel"))
+                               format: 'rdfxml',
+                               predicate: RDF::URI("http://www.w3.org/2008/05/skos#prefLabel"))
     LocalAuthority.count.should == 1
     LocalAuthorityEntry.count.should == 35
   end
   it "should harvest TSV vocabs" do
-    LocalAuthority.harvest_tsv("geo", @tsv, :prefix => 'http://sws.geonames.org/')
+    LocalAuthority.harvest_tsv("geo", @tsv, prefix: 'http://sws.geonames.org/')
     LocalAuthority.count.should == 1
-    auth = LocalAuthority.where(:name => "geo").first
-    LocalAuthorityEntry.where(:local_authority_id => auth.id).first.uri.start_with?('http://sws.geonames.org/').should be_true
+    auth = LocalAuthority.where(name: "geo").first
+    LocalAuthorityEntry.where(local_authority_id: auth.id).first.uri.start_with?('http://sws.geonames.org/').should be_true
     LocalAuthorityEntry.count.should == 149
   end
   describe "when vocabs are harvested" do
     before(:all) do
       class MyTestRdfDatastream; end
       LocalAuthority.harvest_rdf("genres", @nt)
-      LocalAuthority.harvest_tsv("geo", @tsv, :prefix => 'http://sws.geonames.org/')
+      LocalAuthority.harvest_tsv("geo", @tsv, prefix: 'http://sws.geonames.org/')
       DomainTerm.count.should == 0
       @num_auths = LocalAuthority.count
       @num_entries = LocalAuthorityEntry.count
@@ -59,7 +59,7 @@ describe LocalAuthority do
       LocalAuthorityEntry.count.should == @num_entries
     end
     it "should not harvest a TSV vocab twice" do
-      LocalAuthority.harvest_tsv("geo", @tsv, :prefix => 'http://sws.geonames.org/')
+      LocalAuthority.harvest_tsv("geo", @tsv, prefix: 'http://sws.geonames.org/')
       LocalAuthority.count.should == @num_auths
       LocalAuthorityEntry.count.should == @num_entries
     end
@@ -70,7 +70,7 @@ describe LocalAuthority do
     describe "when vocabs are registered" do
       before(:all) do
         LocalAuthority.harvest_rdf("genres", @nt)
-        LocalAuthority.harvest_tsv("geo", @tsv, :prefix => 'http://sws.geonames.org/')
+        LocalAuthority.harvest_tsv("geo", @tsv, prefix: 'http://sws.geonames.org/')
         class TestRdfDatastream; end
         LocalAuthority.register_vocabulary(MyTestRdfDatastream, "geographic", "geo")
         LocalAuthority.register_vocabulary(MyTestRdfDatastream, "genre", "genres")
@@ -91,7 +91,7 @@ describe LocalAuthority do
         LocalAuthority.entries_by_term("my_test", "foobar", "E").should == []
       end
       it "should return entries by term" do
-        term = DomainTerm.where(:model => "my_tests", :term => "genre").first
+        term = DomainTerm.where(model: "my_tests", term: "genre").first
         authorities = term.local_authorities.collect(&:id).uniq
         hits = LocalAuthorityEntry.where("local_authority_id in (?)", authorities).where("label like ?", "A%").select("label, uri").limit(25)
         LocalAuthority.entries_by_term("my_tests", "genre", "A").count.should == 6

data/spec/models/single_use_link_spec.rb

@@ -7,66 +7,63 @@ describe SingleUseLink do
     @file.save
   end
 
-  after (:all) do
-    @file.delete
+  after(:all) do
+    @file.destroy
   end
 
-  let(:file) do
-    @file
-  end
-  
+  let(:file) { @file }
+
   describe "create" do
      before do
-        @now = DateTime.now
-        DateTime.stub(:now).and_return(@now)
-        @hash = "sha2hash"+@now.to_f.to_s
-        Digest::SHA2.should_receive(:new).and_return(@hash)
-        
+      @now = DateTime.now
+      DateTime.stub(:now).and_return(@now)
+      @hash = "sha2hash#{@now.to_f.to_s}"
+      Digest::SHA2.should_receive(:new).and_return(@hash)
      end
      it "should create show link" do
-        su = SingleUseLink.create itemId: file.pid, path: Sufia::Engine.routes.url_helpers.generic_file_path(file.pid)
-        su.downloadKey.should == @hash
-        su.itemId.should == file.pid
-        su.path.should == Sufia::Engine.routes.url_helpers.generic_file_path(file.pid)
-        su.delete
-     end 
+      su = SingleUseLink.create itemId: file.pid, path: Sufia::Engine.routes.url_helpers.generic_file_path(file.pid)
+      su.downloadKey.should == @hash
+      su.itemId.should == file.pid
+      su.path.should == Sufia::Engine.routes.url_helpers.generic_file_path(file.pid)
+      su.delete
+     end
      it "should create show download link" do
-        su = SingleUseLink.create itemId: file.pid, path: Sufia::Engine.routes.url_helpers.download_path(file.pid)
-        su.downloadKey.should == @hash
-        su.itemId.should == file.pid
-        su.path.should == Sufia::Engine.routes.url_helpers.download_path(file.pid)
-        su.delete
-     end 
+      su = SingleUseLink.create itemId: file.pid, path: Sufia::Engine.routes.url_helpers.download_path(file.pid)
+      su.downloadKey.should == @hash
+      su.itemId.should == file.pid
+      su.path.should == Sufia::Engine.routes.url_helpers.download_path(file.pid)
+      su.delete
+     end
   end
   describe "find" do
      describe "not expired" do
        before do
-          @su = SingleUseLink.create(downloadKey:'sha2hashb', itemId:file.pid, path:Sufia::Engine.routes.url_helpers.download_path(file.noid), expires:DateTime.now.advance(:hours => 1))
+          @su = SingleUseLink.create(downloadKey: 'sha2hashb', itemId: file.pid, path: Sufia::Engine.routes.url_helpers.download_path(file.noid), expires: DateTime.now.advance(hours: 1))
        end
        it "should retrieve link" do
-          link = SingleUseLink.where(downloadKey:'sha2hashb').first
+          link = SingleUseLink.where(downloadKey: 'sha2hashb').first
           link.itemId.should == file.pid
-       end 
+       end
        it "should retrieve link with find_by" do
           link = SingleUseLink.find_by_downloadKey('sha2hashb')
           link.itemId.should == file.pid
-       end 
+       end
        it "should expire link" do
-          link = SingleUseLink.where(downloadKey:'sha2hashb').first
-          link.expired?.should == false        
-       end 
+          link = SingleUseLink.where(downloadKey: 'sha2hashb').first
+          link.expired?.should == false
+       end
      end
      describe "expired" do
        before do
-          @su = SingleUseLink.create!(downloadKey:'sha2hashb', itemId:file.pid, path:Sufia::Engine.routes.url_helpers.download_path(file.noid))
+          @su = SingleUseLink.create!(downloadKey: 'sha2hashb', itemId:file.pid, path:Sufia::Engine.routes.url_helpers.download_path(file.noid))
 
-          @su.update_attribute :expires, DateTime.now.advance(:hours => -1)
+          @su.update_attribute :expires, DateTime.now.advance(hours: -1)
        end
 
        it "should expire link" do
-          link = SingleUseLink.where(downloadKey:'sha2hashb').first
-          link.expired?.should == true        
+          link = SingleUseLink.where(downloadKey: 'sha2hashb').first
+          link.expired?.should == true
        end
-     end 
+     end
   end
 end

data/spec/routing/route_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 describe 'Routes' do
   routes { Sufia::Engine.routes }
 
-  describe 'Catalog' do
-    it 'should route the root url to the catalog controller' do
-      { get: '/' }.should route_to(controller: 'catalog', action: 'index')
+  describe 'Homepage' do
+    it 'should route the root url to the homepage controller' do
+      { get: '/' }.should route_to(controller: 'homepage', action: 'index')
     end
   end
 
@@ -72,6 +72,22 @@ describe 'Routes' do
       { get: '/dashboard' }.should route_to(controller: 'dashboard', action: 'index')
     end
 
+    it "should route to dashboard files tab" do
+      { get: '/dashboard/files' }.should route_to(controller: 'dashboard/files', action: 'index')
+    end
+
+    it "should route to dashboard collections tab" do
+      { get: '/dashboard/collections' }.should route_to(controller: 'dashboard/collections', action: 'index')
+    end
+
+    it "should route to dashboard highlighted tab" do
+      { get: '/dashboard/highlights' }.should route_to(controller: 'dashboard/highlights', action: 'index')
+    end
+
+    it "should route to dashboard shared tab" do
+      { get: '/dashboard/shares' }.should route_to(controller: 'dashboard/shares', action: 'index')
+    end
+
     it "should route to dashboard facet" do
       { get: '/dashboard/facet/1' }.should route_to(controller: 'dashboard', action: 'facet', id: '1')
     end

data/spec/spec_helper.rb

@@ -2,14 +2,21 @@
 ENV["RAILS_ENV"] ||= 'test'
 
 require File.expand_path("config/environment", ENV['RAILS_ROOT'] || File.expand_path("../internal", __FILE__))
+
+require 'database_cleaner'
+
 require 'rspec/rails'
 require 'rspec/autorun'
+require 'capybara/poltergeist'
+Capybara.javascript_driver = :poltergeist
+Capybara.default_wait_time = ENV['TRAVIS'] ? 30 : 15
 require 'capybara/rspec'
 require 'capybara/rails'
 require 'equivalent-xml/rspec_matchers'
 
 require File.expand_path('../support/features', __FILE__)
 
+
 if ENV['COVERAGE']
   require 'simplecov'
   SimpleCov.start 'rails'
@@ -69,19 +76,34 @@ RSpec.configure do |config|
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
   config.fixture_path = File.expand_path("../fixtures", __FILE__)
 
-  # If you're not using ActiveRecord, or you'd prefer not to run each of your
-  # examples within a transaction, remove the following line or assign false
-  # instead of true.
-  config.use_transactional_fixtures = true
+  config.use_transactional_fixtures = false
+
+  config.before :each do
+    if Capybara.current_driver == :rack_test
+      DatabaseCleaner.strategy = :transaction
+    else
+      DatabaseCleaner.strategy = :truncation
+    end
+    DatabaseCleaner.start
+  end
+
+  config.after do
+    DatabaseCleaner.clean
+  end
+
 
   # If true, the base class of anonymous controllers will be inferred
   # automatically. This will be the default behavior in future versions of
   # rspec-rails.
   config.infer_base_class_for_anonymous_controllers = false
 
-  config.include Devise::TestHelpers, :type => :controller
-  config.include EngineRoutes, :type => :controller
+  config.include Devise::TestHelpers, type: :controller
+  config.include EngineRoutes, type: :controller
   config.include EquivalentXml::RSpecMatchers
+
+  config.include Warden::Test::Helpers, type: :feature
+  config.after(:each, type: :feature) { Warden.test_reset! }
+  
 end
 
 module FactoryGirl

data/spec/support/features/session_helpers.rb

@@ -11,19 +11,18 @@ module Features
     end
 
     def sign_in(who = :user)
-      if who.instance_of?(User)
-        user = who
+      user = if who.instance_of?(User)
+        who
       else
-        user = FactoryGirl.find_or_create(who)
-        if user.password.nil?   # get the password from the factory if user was retrieved from database
-          tmpl = FactoryGirl.build(who)
-          user.password = tmpl.password
+        FactoryGirl.build(:user).tap do |u|
+          u.save!
         end
       end
       visit new_user_session_path
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password
       click_button 'Sign in'
+      expect(page).to_not have_text 'Invalid email or password.'
     end
   end
 end

data/spec/support/lib/generators/test_app_generator.rb

@@ -22,6 +22,11 @@ class TestAppGenerator < Rails::Generators::Base
     end
   end
 
+  def enable_analytics
+    gsub_file "config/initializers/sufia.rb",
+              "config.analytics = false", "config.analytics = true"
+  end
+
   def add_sufia_assets
     insert_into_file 'app/assets/stylesheets/application.css', after: ' *= require_self' do
       "\n *= require sufia"
@@ -30,4 +35,5 @@ class TestAppGenerator < Rails::Generators::Base
     gsub_file 'app/assets/javascripts/application.js',
               '//= require_tree .', '//= require sufia'
   end
+
 end

data/spec/views/generic_file/edit.html.erb_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 describe 'generic_files/edit.html.erb' do
   describe 'when the file has two or more resource types' do
     let(:generic_file) {
-      content = double('content', versions: [])
+      content = double('content', versions: [], mimeType: 'application/pdf')
       stub_model(GenericFile, noid: '123',
-                                       depositor: 'bob',
-                                       resource_type: ['Book', 'Dataset'],
-                                       content: content)
+        depositor: 'bob',
+        resource_type: ['Book', 'Dataset'],
+        content: content)
     }
 
     before do

data/spec/views/generic_file/show.html.erb_spec.rb

@@ -1,25 +1,26 @@
 require 'spec_helper'
 
 describe 'generic_files/show.html.erb' do
-  describe 'usage statistics' do
-    let(:generic_file) {
-      content = double('content', versions: [])
-      stub_model(GenericFile, noid: '123',
-        depositor: 'bob',
-        audit_stat: 1,
-        content: content)
-    }
-
-    before do
-      allow(controller).to receive(:current_user).and_return(stub_model(User))
-      allow_any_instance_of(Ability).to receive(:can?).and_return(true)
-      assign(:generic_file, generic_file)
-      assign(:events, [])
-    end
+  let(:generic_file) {
+    content = double('content', versions: [], mimeType: 'application/pdf')
+    stub_model(GenericFile, noid: '123',
+               depositor: 'bob',
+               audit_stat: 1,
+               content: content)
+  }
+
+  before do
+    allow(controller).to receive(:current_user).and_return(stub_model(User))
+    allow_any_instance_of(Ability).to receive(:can?).and_return(true)
+    assign(:generic_file, generic_file)
+    assign(:events, [])
+  end
+
+  describe 'analytics' do
 
     context 'when enabled' do
       before do
-        Sufia.config.usage_statistics = true
+        Sufia.config.analytics = true
       end
 
       it 'appears on page' do
@@ -31,7 +32,7 @@ describe 'generic_files/show.html.erb' do
 
     context 'when disabled' do
       before do
-        Sufia.config.usage_statistics = false
+        Sufia.config.analytics = false
       end
 
       it 'does not appear on page' do
@@ -41,4 +42,31 @@ describe 'generic_files/show.html.erb' do
       end
     end
   end
+
+  describe 'featured' do
+
+    context "public file" do
+      before do
+        allow(generic_file).to receive(:public?).and_return(true)
+      end
+
+      it "shows featured feature link for public file" do
+        render
+        page = Capybara::Node::Simple.new(rendered)
+        expect(page).to have_selector('a[data-behavior="feature"]', count: 1)
+      end
+    end
+
+    context "non public file" do
+      before do
+        allow(generic_file).to receive(:public?).and_return(false)
+      end
+
+      it "does not show feature link for non public file" do
+        render
+        page = Capybara::Node::Simple.new(rendered)
+        expect(page).to have_no_selector('a[data-behavior="feature"]', count: 1)
+      end
+    end
+  end
 end

data/spec/views/generic_file/stats.html.erb_spec.rb

@@ -4,13 +4,33 @@ describe 'generic_files/stats.html.erb' do
   describe 'usage statistics' do
     let(:generic_file) {
       stub_model(GenericFile, noid: '123',
-        title: 'file1.txt')
+        title: ['file1.txt'])
+    }
+
+    let(:no_stats) {
+      allow_message_expectations_on_nil
+      allow(FileUsage).to receive(:new)
+      stub_model(FileUsage,
+        created: Date.parse('2014-01-01'),
+        total_pageviews: 0,
+        total_downloads: 0,
+        to_flot: []
+      )
+    }
+
+    let(:stats) {
+      allow(FileUsage).to receive(:new)
+      stub_model(FileUsage,
+        created: Date.parse('2014-01-01'),
+        total_pageviews: 9,
+        total_downloads: 4,
+        to_flot: [[1396422000000,2],[1396508400000,3],[1396594800000,4]]
+      )
     }
 
     before do
       assign(:generic_file, generic_file)
-      assign(:created, Date.parse('2014-01-01'))
-      assign(:stats_json, [].to_json)
+      assign(:stats, no_stats)
     end
 
     it 'shows breadcrumbs' do
@@ -27,20 +47,19 @@ describe 'generic_files/stats.html.erb' do
       it 'shows 0 visits' do
         render
         page = Capybara::Node::Simple.new(rendered)
-        expect(page).to have_selector('div.alert-info', text: /0 views since January 1, 2014/i, count: 1)
+        expect(page).to have_selector('div.alert-info', text: /0 views and 0 downloads since January 1, 2014/i, count: 1)
       end
     end
 
     context 'when results are returned' do
       before do
-        assign(:stats_json, [[1396422000000,2],[1396508400000,3],[1396594800000,4]].to_json)
-        assign(:pageviews, 9)
+        assign(:stats, stats)
       end
 
       it 'shows visits' do
         render
         page = Capybara::Node::Simple.new(rendered)
-        expect(page).to have_selector('div.alert-info', text: /9 views since January 1, 2014/i, count: 1)
+        expect(page).to have_selector('div.alert-info', text: /9 views and 4 downloads since January 1, 2014/i, count: 1)
       end
     end
   end