enju_leaf 1.1.0.rc20 → 1.1.0.rc21

data/spec/controllers/profiles_controller_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe ProfilesController do
   fixtures :all
@@ -192,10 +192,10 @@ describe ProfilesController do
         response.should be_forbidden
         assigns(:profile).should eq admin
       end
-      it "should not be able to delete other librarian user" do
-        librarian = FactoryGirl.create(:librarian_profile)
-        ability = EnjuLeaf::Ability.new(@user, "0.0.0.0")
-        ability.should_not be_able_to( :destroy, librarian )
+
+      it "should show icalendar feed" do
+        get :edit, id: profiles(:user1).id, mode: 'feed_token'
+        response.should render_template("profiles/_feed_token")
       end
     end
 
@@ -405,6 +405,13 @@ describe ProfilesController do
         response.should redirect_to profile_url(assigns(:profile))
         assert_equal assigns(:profile).note, 'test'
       end
+
+      it "should update other user's locked status" do
+        put :update, id: profiles(:user1).id, profile: {:user_attributes => {:id => 3, :locked => '1', :username => 'user1'}}
+        response.should redirect_to profile_url(assigns(:profile))
+        assigns(:profile).user.locked_at.should be_truthy
+        assigns(:profile).user.access_locked?.should be_truthy
+      end
     end
 
     describe "When logged in as User" do
@@ -536,6 +543,12 @@ describe ProfilesController do
         delete :destroy, id: profiles(:librarian1).id
         response.should be_forbidden
       end
+
+      it "should not be able to delete other librarian user" do
+        librarian = FactoryGirl.create(:librarian_profile)
+        ability = EnjuLeaf::Ability.new(@user, "0.0.0.0")
+        ability.should_not be_able_to( :destroy, librarian )
+      end
     end
 
     describe "When logged in as User" do
@@ -559,6 +572,7 @@ describe ProfilesController do
     describe "When not logged in" do
       it "destroys the requested user" do
         delete :destroy, id: profiles(:user2).id
+        response.should redirect_to(new_user_session_url)
       end
 
       it "should be forbidden" do

data/spec/controllers/user_import_files_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe UserImportFilesController do
   fixtures :all
@@ -50,6 +50,13 @@ describe UserImportFilesController do
         assigns(:user_import_file).should eq(user_import_files(:two))
         expect(response).to be_success
       end
+
+      it "assigns user_import_results" do
+        get :show, id: user_import_files(:one).id
+        expect(response).to be_success
+        expect(assigns(:user_import_file)).to eq user_import_files(:one)
+        expect(assigns(:user_import_results)).to include user_import_results(:one)
+      end
     end
 
     describe "When logged in as Librarian" do

data/spec/controllers/user_import_results_controller_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe UserImportResultsController do
   fixtures :all
@@ -12,6 +12,26 @@ describe UserImportResultsController do
         get :index
         assigns(:user_import_results).should eq(UserImportResult.page(1))
       end
+
+      describe "With @user_import_file parameter" do
+        before (:each) do
+          @file = UserImportFile.create user_import: File.new("#{Rails.root}/../../examples/user_import_file_sample_long.tsv"), user: users(:admin)
+          @file.default_user_group = UserGroup.find(2)
+          @file.default_library = Library.find(3)
+          @file.save
+          result = @file.import_start
+        end
+        render_views
+        it "should assign all user_import_results for the user_import_file with a page parameter" do
+          get :index, user_import_file_id: @file.id
+          results = assigns(:user_import_results)
+          results.should_not be_empty
+          get :index, user_import_file_id: @file.id, page: 2
+          results2 = assigns(:user_import_results)
+          results2.first.should_not eq results.first
+          response.body.should match /<td>11<\/td>/
+        end
+      end
     end
 
     describe "When logged in as Librarian" do

data/spec/dummy/app/assets/javascripts/application.js

@@ -2,14 +2,12 @@
 // listed below.
 //
 // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
+// compiled file.
 //
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
+// about supported directives.
 //
-//= require jquery
-//= require jquery_ujs
 //= require_tree .

data/spec/dummy/config/initializers/kaminari_config.rb

@@ -0,0 +1,10 @@
+Kaminari.configure do |config|
+  config.default_per_page = 10
+  # config.max_per_page = nil
+  # config.window = 4
+  # config.outer_window = 0
+  # config.left = 0
+  # config.right = 0
+  # config.page_method_name = :page
+  # config.param_name = :page
+end

data/spec/fixtures/user_import_files.yml

@@ -1,6 +1,7 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
 one:
+  id: 1
   user_id: 1
   note: MyText
   executed_at: 2014-01-10 21:22:16
@@ -13,6 +14,7 @@ one:
   error_message: MyText
 
 two:
+  id: 2
   user_id: 1
   note: MyText
   executed_at: 2014-01-10 21:22:16

data/spec/models/user_import_file_spec.rb

@@ -1,12 +1,12 @@
 # -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe UserImportFile do
   fixtures :all
 
   describe "when its mode is 'create'" do
     before(:each) do
-      @file = UserImportFile.new :user_import => File.new("#{Rails.root}/../../examples/user_import_file_sample.tsv")
+      @file = UserImportFile.new user_import: File.new("#{Rails.root}/../../examples/user_import_file_sample.tsv")
       @file.default_user_group = UserGroup.find(2)
       @file.default_library = Library.find(3)
       @file.user = users(:admin)
@@ -95,12 +95,15 @@ describe UserImportFile do
   end
 
   describe "when its mode is 'update'" do
-    it "should update users" do
+    before(:each) do
       FactoryGirl.create(:user,
         username: 'user001',
         profile: FactoryGirl.create(:profile)
       )
-      @file = UserImportFile.create :user_import => File.new("#{Rails.root}/../../examples/user_update_file.tsv")
+    end
+    it "should update users" do
+      @file = UserImportFile.create user_import: File.new("#{Rails.root}/../../examples/user_update_file.tsv"), user: users(:admin)
+      old_message_count = Message.count
       result = @file.modify
       result.should have_key(:user_updated)
       user001 = User.where(username: 'user001').first
@@ -110,21 +113,20 @@ describe UserImportFile do
       user001.profile.user_number.should eq 'user_number_1'
       user001.profile.note.should eq 'test'
       user001.profile.keyword_list.should eq 'keyword1 keyword2'
+      Message.count.should eq old_message_count + 1
     end
 
     it "should not overwrite with null value" do
-      FactoryGirl.create(:user,
-        username: 'user001',
-        profile: FactoryGirl.create(:profile,
-          user_number: '001',
-          full_name: 'User 001',
-          full_name_transcription: 'User 001',
-          locale: 'ja',
-          note: 'Note',
-          keyword_list: 'keyword1 keyword2',
-          date_of_birth: 10.years.ago)
-      )
-      @file = UserImportFile.create :user_import => File.new("#{Rails.root}/../../examples/user_update_file2.tsv")
+      user = User.where(username: 'user001').first
+      user.profile = FactoryGirl.create(:profile,
+        user_number: '001',
+        full_name: 'User 001',
+        full_name_transcription: 'User 001',
+        locale: 'ja',
+        note: 'Note',
+        keyword_list: 'keyword1 keyword2',
+        date_of_birth: 10.years.ago)
+      @file = UserImportFile.create user_import: File.new("#{Rails.root}/../../examples/user_update_file2.tsv"), user: users(:admin)
       result = @file.modify
       result.should have_key(:user_updated)
       user001 = User.find('user001')
@@ -135,20 +137,24 @@ describe UserImportFile do
       user001.profile.keyword_list.should eq 'keyword1 keyword2'
     end
     it "should update user_number" do
-      FactoryGirl.create(:user,
-                         username: 'user001',
-                         profile: FactoryGirl.create(:profile))
-      @file = UserImportFile.create :user_import => File.new("#{Rails.root}/../../examples/user_update_file3.tsv")
+      @file = UserImportFile.create user_import: File.new("#{Rails.root}/../../examples/user_update_file3.tsv"), user: users(:admin)
       result = @file.modify
       result.should have_key(:user_updated)
       user001 = User.where(username: 'user001').first
       user001.profile.user_number.should eq '0001'
     end
+    it "should update user's lock status" do
+      @file = UserImportFile.create user_import: File.new("#{Rails.root}/../../examples/user_update_file4.tsv"), user: users(:admin)
+      result = @file.modify
+      result.should have_key(:user_updated)
+      user001 = User.where(username: 'user001').first
+      user001.access_locked?.should be_truthy
+    end
   end
 
   describe "when its mode is 'destroy'" do
     before(:each) do
-      @file = UserImportFile.new :user_import => File.new("#{Rails.root}/../../examples/user_import_file_sample.tsv")
+      @file = UserImportFile.new user_import: File.new("#{Rails.root}/../../examples/user_import_file_sample.tsv"), user: users(:admin)
       @file.user = users(:admin)
       @file.default_user_group = UserGroup.find(2)
       @file.default_library = Library.find(3)
@@ -158,24 +164,26 @@ describe UserImportFile do
 
     it "should remove users" do
       old_count = User.count
-      @file = UserImportFile.create :user_import => File.new("#{Rails.root}/../../examples/user_delete_file.tsv")
+      @file = UserImportFile.create user_import: File.new("#{Rails.root}/../../examples/user_delete_file.tsv"), user: users(:admin)
       @file.user = users(:admin)
+      old_message_count = Message.count
       @file.remove
       User.count.should eq old_count - 2
+      Message.count.should eq old_message_count + 1
     end
 
     it "should not remove users if there are checkouts" do
       user001 = User.where(username: 'user001').first
       checkout = FactoryGirl.create(:checkout, user: user001, item: FactoryGirl.create(:item))
       old_count = User.count
-      @file = UserImportFile.create :user_import => File.new("#{Rails.root}/../../examples/user_delete_file.tsv")
+      @file = UserImportFile.create user_import: File.new("#{Rails.root}/../../examples/user_delete_file.tsv"), user: users(:admin)
       @file.remove
       User.where(username: 'user001').should_not be_blank
     end
   end
 
   it "should import in background" do
-    file = UserImportFile.new :user_import => File.new("#{Rails.root}/../../examples/user_import_file_sample.tsv")
+    file = UserImportFile.new user_import: File.new("#{Rails.root}/../../examples/user_import_file_sample.tsv"), user: users(:admin)
     file.user = users(:admin)
     file.default_user_group = UserGroup.find(2)
     file.default_library = Library.find(3)

data/spec/models/user_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe User do
   #pending "add some examples to (or delete) #{__FILE__}"
@@ -136,6 +136,34 @@ describe User do
       users(:librarian1).reserves.not_sent_expiration_notice_to_patron.should be_empty
     end
   end
+
+  describe ".export" do
+    it "should export all user's information" do
+      lines = User.export
+      expect(lines).not_to be_empty
+      expect(lines.split(/\r\n/).size).to eq User.all.size + 1
+    end
+    it "should export share_bookmarks and save_search_history" do
+      user = FactoryGirl.create(:user,
+        profile: FactoryGirl.create(:profile,
+          share_bookmarks: true,
+          save_search_history: true))
+      lines = User.export
+      rows = CSV.new(lines, col_sep: "\t", headers: true)
+      rows.each do |row|
+        if row["username"] == user.username
+          expect(row["share_bookmarks"]).to eq "true"
+          expect(row["save_search_history"]).to eq "true"
+        end
+      end
+    end
+    it "should work even if EnjuBookmark module is undefined" do
+      Object.send(:remove_const, :EnjuBookmark)
+      lines = User.export
+      expect(lines).not_to be_empty
+      expect(lines.split(/\r\n/).size).to eq User.all.size + 1
+    end
+  end
 end
 # == Schema Information
 #

data/spec/rails_helper.rb

@@ -0,0 +1,82 @@
+require 'simplecov'
+require 'coveralls'
+SimpleCov.start 'rails'
+Coveralls.wear!
+
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../../spec/dummy/config/environment', __FILE__)
+# Prevent database truncation if the environment is production
+abort("The Rails environment is running in production mode!") if Rails.env.production?
+require 'spec_helper'
+require 'rspec/rails'
+# Add additional requires below this line. Rails is not loaded until this point!
+require 'vcr'
+require 'factory_girl'
+require 'sunspot-rails-tester'
+require 'rspec/active_model/mocks'
+require 'capybara/rspec'
+require 'cancan/matchers'
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
+# Requires supporting ruby files with custom matchers and macros, etc, in
+# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
+# run as spec files by default. This means that files in spec/support that end
+# in _spec.rb will both be required and run as specs, causing the specs to be
+# run twice. It is recommended that you do not name files matching this glob to
+# end with _spec.rb. You can configure this pattern with the --pattern
+# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
+#
+# The following line is provided for convenience purposes. It has the downside
+# of increasing the boot-up time by auto-requiring all files in the support
+# directory. Alternatively, in the individual `*_spec.rb` files, manually
+# require only the support files necessary.
+#
+# Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
+
+# Checks for pending migrations before tests are run.
+# If you are not using ActiveRecord, you can remove this line.
+ActiveRecord::Migration.maintain_test_schema! if Rails::VERSION::MAJOR >= 4
+
+RSpec.configure do |config|
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/../../spec/fixtures"
+
+  # 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
+
+  # RSpec Rails can automatically mix in different behaviours to your tests
+  # based on their file location, for example enabling you to call `get` and
+  # `post` in specs under `spec/controllers`.
+  #
+  # You can disable this behaviour by removing the line below, and instead
+  # explicitly tag your specs with their type, e.g.:
+  #
+  #     RSpec.describe UsersController, :type => :controller do
+  #       # ...
+  #     end
+  #
+  # The different available types are documented in the features, such as in
+  # https://relishapp.com/rspec/rspec-rails/docs
+  config.infer_spec_type_from_file_location!
+
+  config.extend ControllerMacros, :type => :controller
+
+  $original_sunspot_session = Sunspot.session
+
+  config.before do
+    Sunspot.session = Sunspot::Rails::StubSessionProxy.new($original_sunspot_session)
+  end
+
+  config.before :each, :solr => true do
+    Sunspot::Rails::Tester.start_original_sunspot_session
+    Sunspot.session = $original_sunspot_session
+    Sunspot.remove_all!
+  end
+end
+
+FactoryGirl.definition_file_paths << "#{::Rails.root}/../../spec/factories"
+FactoryGirl.find_definitions
+

data/spec/spec_helper.rb

@@ -1,57 +1,92 @@
-require 'simplecov'
-require 'coveralls'
-SimpleCov.start 'rails'
-Coveralls.wear!
-
-require 'capybara/rspec'
-require 'cancan/matchers'
-
-# This file is copied to spec/ when you run 'rails generate rspec:install'
-ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../dummy/config/environment", __FILE__)
-require 'rspec/rails'
-require 'vcr'
-require 'factory_girl'
-require 'sunspot-rails-tester'
-require 'rspec/active_model/mocks'
-
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
+# This file was generated by the `rails generate rspec:install` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  # == Mock Framework
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
-  config.mock_with :rspec
-
-  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/../../spec/fixtures"
-
-  # 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.extend ControllerMacros, :type => :controller
-
-  $original_sunspot_session = Sunspot.session
-
-  config.before do
-    Sunspot.session = Sunspot::Rails::StubSessionProxy.new($original_sunspot_session)
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
 
-  config.before :each, :solr => true do
-    Sunspot::Rails::Tester.start_original_sunspot_session
-    Sunspot.session = $original_sunspot_session
-    Sunspot.remove_all!
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
   end
 
-  config.infer_spec_type_from_file_location!
-end
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = "spec/examples.txt"
 
-FactoryGirl.definition_file_paths << "#{::Rails.root}/../../spec/factories"
-FactoryGirl.find_definitions
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  config.disable_monkey_patching!
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
+end

data/spec/views/page/configuration.html.erb_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe "page/configuration" do
   fixtures :all

data/spec/views/user_import_results/index.html.erb_spec.rb

@@ -0,0 +1,32 @@
+require 'rails_helper'
+
+describe "user_import_results/index" do
+  fixtures :all
+
+  before(:each) do
+    assign(:user_import_results, UserImportResult.page(1))
+    admin = User.find('enjuadmin')
+    view.stub(:current_user).and_return(admin)
+    @ability = EnjuLeaf::Ability.new(admin, '0.0.0.0')
+    @ability.extend(CanCan::Ability)
+    controller.stub(:current_ability) { @ability }
+  end
+
+  it "renders a list of user_import_results" do
+    render
+    expect(rendered).to match /MyString/
+  end
+
+  context "with @user_import_file" do
+    before(:each) do
+      @user_import_file = UserImportFile.find(1)
+      @user_import_results = UserImportResult.where(user_import_file_id: 1).page(1)
+    end
+    it "renders a list of user_import_results for the user_import_file" do
+      render
+      expect(view).to render_template "user_import_results/_list_lines"
+      expect(rendered).to match /MyString/
+      expect(rendered).to match /<td>1<\/td>/
+    end
+  end
+end