enju_library 0.2.5 → 0.3.0.beta.2

data/spec/controllers/user_import_files_controller_spec.rb

@@ -46,13 +46,13 @@ describe UserImportFilesController do
       login_fixture_admin
 
       it 'assigns the requested user_import_file as @user_import_file' do
-        get :show, id: user_import_files(:two).id
+        get :show, params: { id: user_import_files(:two).id }
         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
+        get :show, params: { 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)
@@ -63,7 +63,7 @@ describe UserImportFilesController do
       login_fixture_librarian
 
       it 'assigns the requested user_import_file as @user_import_file' do
-        get :show, id: user_import_files(:two).id
+        get :show, params: { id: user_import_files(:two).id }
         assigns(:user_import_file).should eq(user_import_files(:two))
         expect(response).to be_success
       end
@@ -73,7 +73,7 @@ describe UserImportFilesController do
       login_fixture_user
 
       it 'assigns the requested user_import_file as @user_import_file' do
-        get :show, id: user_import_files(:two).id
+        get :show, params: { id: user_import_files(:two).id }
         assigns(:user_import_file).should eq(user_import_files(:two))
         expect(response).to be_forbidden
       end
@@ -81,7 +81,7 @@ describe UserImportFilesController do
 
     describe 'When not logged in' do
       it 'assigns the requested user_import_file as @user_import_file' do
-        get :show, id: user_import_files(:two).id
+        get :show, params: { id: user_import_files(:two).id }
         assigns(:user_import_file).should eq(user_import_files(:two))
         expect(response).to redirect_to(new_user_session_url)
       end
@@ -138,7 +138,11 @@ describe UserImportFilesController do
       end
 
       it 'should create agent_import_file' do
-        post :create, user_import_file: { user_import: fixture_file_upload('/../../examples/user_import_file_sample.tsv', 'text/csv') }
+        post :create, params: { user_import_file: {
+          user_import: fixture_file_upload('/../../examples/user_import_file_sample.tsv', 'text/csv'),
+          default_library_id: 1,
+          default_user_group_id: 1
+        }}
         assigns(:user_import_file).should be_valid
         assigns(:user_import_file).user.username.should eq @user.username
         expect(response).to redirect_to user_import_file_url(assigns(:user_import_file))
@@ -154,7 +158,7 @@ describe UserImportFilesController do
       end
 
       it 'should be forbidden' do
-        post :create, user_import_file: { user_import: fixture_file_upload('/../../examples/user_import_file_sample.tsv', 'text/csv') }
+        post :create, params: { user_import_file: { user_import: fixture_file_upload('/../../examples/user_import_file_sample.tsv', 'text/csv') } }
         assigns(:user_import_file).should be_nil
         expect(response).to be_forbidden
       end
@@ -162,7 +166,7 @@ describe UserImportFilesController do
 
     describe 'When not logged in' do
       it 'should be redirected to new session url' do
-        post :create, user_import_file: { user_import: fixture_file_upload('/../../examples/user_import_file_sample.tsv', 'text/csv') }
+        post :create, params: { user_import_file: { user_import: fixture_file_upload('/../../examples/user_import_file_sample.tsv', 'text/csv') } }
         assigns(:user_import_file).should be_nil
         expect(response).to redirect_to new_user_session_url
       end
@@ -175,7 +179,7 @@ describe UserImportFilesController do
 
       it 'assigns the requested user_import_file as @user_import_file' do
         user_import_file = user_import_files(:one)
-        get :edit, id: user_import_file.id
+        get :edit, params: { id: user_import_file.id }
         assigns(:user_import_file).should eq(user_import_file)
       end
     end
@@ -185,7 +189,7 @@ describe UserImportFilesController do
 
       it 'assigns the requested user_import_file as @user_import_file' do
         user_import_file = user_import_files(:one)
-        get :edit, id: user_import_file.id
+        get :edit, params: { id: user_import_file.id }
         assigns(:user_import_file).should eq(user_import_file)
       end
     end
@@ -195,7 +199,7 @@ describe UserImportFilesController do
 
       it 'assigns the requested user_import_file as @user_import_file' do
         user_import_file = user_import_files(:one)
-        get :edit, id: user_import_file.id
+        get :edit, params: { id: user_import_file.id }
         expect(response).to be_forbidden
       end
     end
@@ -203,7 +207,7 @@ describe UserImportFilesController do
     describe 'When not logged in' do
       it 'should not assign the requested user_import_file as @user_import_file' do
         user_import_file = user_import_files(:one)
-        get :edit, id: user_import_file.id
+        get :edit, params: { id: user_import_file.id }
         expect(response).to redirect_to(new_user_session_url)
       end
     end
@@ -214,8 +218,13 @@ describe UserImportFilesController do
       login_fixture_admin
 
       it 'should update user_import_file' do
-        post :create, user_import_file: { user_import: fixture_file_upload('/../../examples/user_import_file_sample.tsv', 'text/csv') }
-        put :update, id: assigns(:user_import_file).id, user_import_file: { note: 'test' }
+        user_import_file = UserImportFile.create!(
+          user_import: fixture_file_upload('/../../examples/user_import_file_sample.tsv', 'text/csv'),
+          user: users(:admin),
+          default_library_id: 1,
+          default_user_group_id: 1
+        )
+        put :update, params: { id: user_import_file.id, user_import_file: { note: 'test' } }
         expect(response).to redirect_to user_import_file_url(assigns(:user_import_file))
       end
     end
@@ -224,8 +233,13 @@ describe UserImportFilesController do
       login_fixture_librarian
 
       it 'should update user_import_file' do
-        post :create, user_import_file: { user_import: fixture_file_upload('/../../examples/user_import_file_sample.tsv', 'text/csv') }
-        put :update, id: assigns(:user_import_file).id, user_import_file: { note: 'test' }
+        user_import_file = UserImportFile.create!(
+          user_import: fixture_file_upload('/../../examples/user_import_file_sample.tsv', 'text/csv'),
+          user: users(:admin),
+          default_library_id: 1,
+          default_user_group_id: 1
+        )
+        put :update, params: { id: user_import_file.id, user_import_file: { note: 'test' } }
         expect(response).to redirect_to user_import_file_url(assigns(:user_import_file))
       end
     end
@@ -234,14 +248,14 @@ describe UserImportFilesController do
       login_fixture_user
 
       it 'should not update user_import_file' do
-        put :update, id: user_import_files(:two).id, user_import_file: {}
+        put :update, params: { id: user_import_files(:two).id, user_import_file: {} }
         expect(response).to be_forbidden
       end
     end
 
     describe 'When not logged in' do
       it 'should not update user_import_file' do
-        put :update, id: user_import_files(:two).id, user_import_file: {}
+        put :update, params: { id: user_import_files(:two).id, user_import_file: {} }
         expect(response).to redirect_to new_user_session_url
       end
     end
@@ -256,11 +270,11 @@ describe UserImportFilesController do
       login_fixture_admin
 
       it 'destroys the requested user_import_file' do
-        delete :destroy, id: @user_import_file.id
+        delete :destroy, params: { id: @user_import_file.id }
       end
 
       it 'redirects to the user_import_files list' do
-        delete :destroy, id: @user_import_file.id
+        delete :destroy, params: { id: @user_import_file.id }
         expect(response).to redirect_to(user_import_files_url)
       end
     end
@@ -269,11 +283,11 @@ describe UserImportFilesController do
       login_fixture_librarian
 
       it 'destroys the requested user_import_file' do
-        delete :destroy, id: @user_import_file.id
+        delete :destroy, params: { id: @user_import_file.id }
       end
 
       it 'redirects to the user_import_files list' do
-        delete :destroy, id: @user_import_file.id
+        delete :destroy, params: { id: @user_import_file.id }
         expect(response).to redirect_to(user_import_files_url)
       end
     end
@@ -282,22 +296,22 @@ describe UserImportFilesController do
       login_fixture_user
 
       it 'destroys the requested user_import_file' do
-        delete :destroy, id: @user_import_file.id
+        delete :destroy, params: { id: @user_import_file.id }
       end
 
       it 'should be forbidden' do
-        delete :destroy, id: @user_import_file.id
+        delete :destroy, params: { id: @user_import_file.id }
         expect(response).to be_forbidden
       end
     end
 
     describe 'When not logged in' do
       it 'destroys the requested user_import_file' do
-        delete :destroy, id: @user_import_file.id
+        delete :destroy, params: { id: @user_import_file.id }
       end
 
       it 'should be forbidden' do
-        delete :destroy, id: @user_import_file.id
+        delete :destroy, params: { id: @user_import_file.id }
         expect(response).to redirect_to(new_user_session_url)
       end
     end

data/spec/controllers/user_import_results_controller_spec.rb

@@ -22,7 +22,7 @@ describe UserImportResultsController do
         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
+          get :index, params: { user_import_file_id: @file.id }
           results = assigns(:user_import_results)
           results.should_not be_empty
           response.body.should match /<td>11<\/td>/
@@ -63,7 +63,7 @@ describe UserImportResultsController do
       login_fixture_admin
 
       it 'assigns the requested user_import_result as @user_import_result' do
-        get :show, id: 1
+        get :show, params: { id: 1 }
         assigns(:user_import_result).should eq(UserImportResult.find(1))
       end
     end
@@ -72,7 +72,7 @@ describe UserImportResultsController do
       login_fixture_librarian
 
       it 'assigns the requested user_import_result as @user_import_result' do
-        get :show, id: 1
+        get :show, params: { id: 1 }
         assigns(:user_import_result).should eq(UserImportResult.find(1))
       end
     end
@@ -81,14 +81,14 @@ describe UserImportResultsController do
       login_fixture_user
 
       it 'assigns the requested user_import_result as @user_import_result' do
-        get :show, id: 1
+        get :show, params: { id: 1 }
         assigns(:user_import_result).should eq(UserImportResult.find(1))
       end
     end
 
     describe 'When not logged in' do
       it 'assigns the requested user_import_result as @user_import_result' do
-        get :show, id: 1
+        get :show, params: { id: 1 }
         assigns(:user_import_result).should eq(UserImportResult.find(1))
         response.should redirect_to(new_user_session_url)
       end
@@ -104,11 +104,11 @@ describe UserImportResultsController do
       login_fixture_admin
 
       it 'destroys the requested user_import_result' do
-        delete :destroy, id: @user_import_result.id
+        delete :destroy, params: { id: @user_import_result.id }
       end
 
       it 'should be forbidden' do
-        delete :destroy, id: @user_import_result.id
+        delete :destroy, params: { id: @user_import_result.id }
         response.should be_forbidden
       end
     end
@@ -117,11 +117,11 @@ describe UserImportResultsController do
       login_fixture_librarian
 
       it 'destroys the requested user_import_result' do
-        delete :destroy, id: @user_import_result.id
+        delete :destroy, params: { id: @user_import_result.id }
       end
 
       it 'should be forbidden' do
-        delete :destroy, id: @user_import_result.id
+        delete :destroy, params: { id: @user_import_result.id }
         response.should be_forbidden
       end
     end
@@ -130,22 +130,22 @@ describe UserImportResultsController do
       login_fixture_user
 
       it 'destroys the requested user_import_result' do
-        delete :destroy, id: @user_import_result.id
+        delete :destroy, params: { id: @user_import_result.id }
       end
 
       it 'should be forbidden' do
-        delete :destroy, id: @user_import_result.id
+        delete :destroy, params: { id: @user_import_result.id }
         response.should be_forbidden
       end
     end
 
     describe 'When not logged in' do
       it 'destroys the requested user_import_result' do
-        delete :destroy, id: @user_import_result.id
+        delete :destroy, params: { id: @user_import_result.id }
       end
 
       it 'should be forbidden' do
-        delete :destroy, id: @user_import_result.id
+        delete :destroy, params: { id: @user_import_result.id }
         response.should redirect_to(new_user_session_url)
       end
     end

data/spec/controllers/withdraws_controller_spec.rb

@@ -45,7 +45,7 @@ RSpec.describe WithdrawsController, type: :controller do
       login_fixture_admin
       it 'assigns all withdraws as @withdraws' do
         Withdraw.create! valid_attributes
-        get :index, basket_id: 1
+        get :index, params: { basket_id: 1 }
         expect(assigns(:withdraws)).to eq baskets(:basket_00001).withdraws.order('withdraws.created_at DESC').page(1)
       end
     end
@@ -56,7 +56,7 @@ RSpec.describe WithdrawsController, type: :controller do
       login_fixture_admin
       it 'assigns the requested withdraw as @withdraw' do
         withdraw = Withdraw.create! valid_attributes
-        get :show, id: withdraw.to_param
+        get :show, params: { id: withdraw.to_param }
         expect(assigns(:withdraw)).to eq(withdraw)
         response.should be_success
       end
@@ -79,25 +79,24 @@ RSpec.describe WithdrawsController, type: :controller do
       context 'with valid params' do
         it 'creates a new Withdraw' do
           expect do
-            post :create, valid_create_attributes
+            post :create, params: valid_create_attributes
           end.to change(Withdraw, :count).by(1)
           expect(assigns(:withdraw)).to be_persisted
         end
 
         it 'assigns a newly created withdraw as @withdraw' do
-          post :create, valid_create_attributes
+          post :create, params: valid_create_attributes
           expect(assigns(:withdraw)).to be_a(Withdraw)
           expect(assigns(:withdraw)).to be_persisted
         end
 
         it 'redirects to the created withdraw' do
-          post :create, valid_create_attributes
+          post :create, params: valid_create_attributes
           expect(response).to redirect_to(withdraws_path(basket_id: valid_create_attributes[:basket_id]))
         end
 
         it 'should not withdraw a checked-out item' do
-          post :create, basket_id: valid_create_attributes[:basket_id],
-            withdraw: { item_identifier: '00001' }
+          post :create, params: { basket_id: valid_create_attributes[:basket_id], withdraw: { item_identifier: '00001' } }
           expect(assigns(:withdraw)).to be_a(Withdraw)
           expect(response).to be_success
         end
@@ -105,12 +104,12 @@ RSpec.describe WithdrawsController, type: :controller do
 
       context 'with invalid params' do
         it 'assigns a newly created but unsaved withdraw as @withdraw' do
-          post :create, basket_id: valid_create_attributes[:basket_id], withdraw: { item_id: nil }
+          post :create, params: { basket_id: valid_create_attributes[:basket_id], withdraw: { item_id: nil } }
           expect(assigns(:withdraw)).to be_a_new(Withdraw)
         end
 
         it "re-renders the 'new' template" do
-          post :create, basket_id: valid_create_attributes[:basket_id], withdraw: { item_id: nil }
+          post :create, params: { basket_id: valid_create_attributes[:basket_id], withdraw: { item_id: nil } }
           expect(response).to render_template('index')
         end
       end
@@ -123,13 +122,13 @@ RSpec.describe WithdrawsController, type: :controller do
       it 'destroys the requested withdraw' do
         withdraw = Withdraw.create! valid_attributes
         expect do
-          delete :destroy, id: withdraw.to_param
+          delete :destroy, params: { id: withdraw.to_param }
         end.to change(Withdraw, :count).by(-1)
       end
 
       it 'redirects to the withdraws list' do
         withdraw = Withdraw.create! valid_attributes
-        delete :destroy, id: withdraw.to_param
+        delete :destroy, params: { id: withdraw.to_param }
         expect(response).to redirect_to(withdraws_url)
       end
     end

data/spec/dummy/app/helpers/application_helper.rb

@@ -1,4 +1,4 @@
 module ApplicationHelper
-  include EnjuLeaf::EnjuLeafHelper
-  include EnjuBiblio::BiblioHelper
+  include EnjuLeaf::ApplicationHelper
+  include EnjuBiblio::ApplicationHelper
 end

data/spec/dummy/app/models/user.rb

@@ -1,7 +1,7 @@
 class User < ActiveRecord::Base
   devise :database_authenticatable, #:registerable,
     :recoverable, :rememberable, :trackable, #, :validatable
-    :lockable, :lock_strategy => :none, :unlock_strategy => :none
+    :lockable, lock_strategy: :none, unlock_strategy: :none
 
   include EnjuSeed::EnjuUser
   include EnjuCirculation::EnjuUser
@@ -10,6 +10,7 @@ end
 Accept.include(EnjuCirculation::EnjuAccept)
 Basket.include(EnjuCirculation::EnjuBasket)
 Manifestation.include(EnjuCirculation::EnjuManifestation)
+Manifestation.include(EnjuSubject::EnjuManifestation)
 Item.include(EnjuCirculation::EnjuItem)
 Item.include(EnjuLibrary::EnjuItem)
 Withdraw.include(EnjuCirculation::EnjuWithdraw)

data/spec/dummy/bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application', __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

data/spec/dummy/bin/setup

@@ -1,29 +1,38 @@
 #!/usr/bin/env ruby
 require 'pathname'
+require 'fileutils'
+include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
 
-Dir.chdir APP_ROOT do
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
   # This script is a starting point to setup your application.
-  # Add necessary setup steps to this file:
+  # Add necessary setup steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
 
-  puts "== Installing dependencies =="
-  system "gem install bundler --conservative"
-  system "bundle check || bundle install"
 
   # puts "\n== Copying sample files =="
-  # unless File.exist?("config/database.yml")
-  #   system "cp config/database.yml.sample config/database.yml"
+  # unless File.exist?('config/database.yml')
+  #   cp 'config/database.yml.sample', 'config/database.yml'
   # end
 
   puts "\n== Preparing database =="
-  system "bin/rake db:setup"
+  system! 'bin/rails db:setup'
 
   puts "\n== Removing old logs and tempfiles =="
-  system "rm -f log/*"
-  system "rm -rf tmp/cache"
+  system! 'bin/rails log:clear tmp:clear'
 
   puts "\n== Restarting application server =="
-  system "touch tmp/restart.txt"
+  system! 'bin/rails restart'
 end