enju_bookmark 0.2.2 → 0.3.0.beta.1

data/spec/controllers/manifestations_controller_spec.rb

@@ -0,0 +1,48 @@
+require 'rails_helper'
+
+describe ManifestationsController do
+  fixtures :all
+
+  def valid_attributes
+    FactoryBot.attributes_for(:manifestation)
+  end
+
+  describe 'GET index', solr: true do
+    before do
+      Manifestation.reindex
+    end
+
+    describe 'When not logged in' do
+      it 'should get tag_cloud' do
+        get :index, params: { query: '2005', view: 'tag_cloud' }
+        expect(response).to be_success
+        expect(response).to render_template('manifestations/_tag_cloud')
+      end
+    end
+
+    describe 'When not logged in' do
+      it 'should show manifestation with tag_edit' do
+        get :show, params: { id: 1, mode: 'tag_edit' }
+        expect(response).to render_template('manifestations/_tag_edit')
+        expect(response).to be_success
+      end
+
+      it 'should show manifestation with tag_list' do
+        get :show, params: { id: 1, mode: 'tag_list' }
+        expect(response).to render_template('manifestations/_tag_list')
+        expect(response).to be_success
+      end
+    end
+  end
+
+  describe 'GET edit' do
+    describe 'When logged in as User' do
+      login_fixture_user
+
+      it 'should edit manifestation with tag_edit' do
+        get :edit, params: { id: 1, mode: 'tag_edit' }
+        expect(response).to be_success
+      end
+    end
+  end
+end

data/spec/controllers/tags_controller_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 describe TagsController do
   fixtures :all
 
-  describe "GET index", :solr => true do
+  describe "GET index", solr: true do
     before do
       Tag.reindex
     end
@@ -49,7 +49,7 @@ describe TagsController do
 
       it "assigns the requested tag as @tag" do
         tag = FactoryBot.create(:tag)
-        get :show, :id => tag.name
+        get :show, params: { id: tag.name }
         expect(assigns(:tag)).to eq(tag)
       end
     end
@@ -59,7 +59,7 @@ describe TagsController do
 
       it "assigns the requested tag as @tag" do
         tag = FactoryBot.create(:tag)
-        get :show, :id => tag.name
+        get :show, params: { id: tag.name }
         expect(assigns(:tag)).to eq(tag)
       end
     end
@@ -69,7 +69,7 @@ describe TagsController do
 
       it "assigns the requested tag as @tag" do
         tag = FactoryBot.create(:tag)
-        get :show, :id => tag.name
+        get :show, params: { id: tag.name }
         expect(assigns(:tag)).to eq(tag)
       end
     end
@@ -77,7 +77,7 @@ describe TagsController do
     describe "When not logged in" do
       it "assigns the requested tag as @tag" do
         tag = FactoryBot.create(:tag)
-        get :show, :id => tag.name
+        get :show, params: { id: tag.name }
         expect(assigns(:tag)).to eq(tag)
       end
     end
@@ -89,7 +89,7 @@ describe TagsController do
 
       it "assigns the requested tag as @tag" do
         tag = FactoryBot.create(:tag)
-        get :edit, :id => tag.name
+        get :edit, params: { id: tag.name }
         expect(assigns(:tag)).to eq(tag)
       end
     end
@@ -99,7 +99,7 @@ describe TagsController do
 
       it "assigns the requested tag as @tag" do
         tag = FactoryBot.create(:tag)
-        get :edit, :id => tag.name
+        get :edit, params: { id: tag.name }
         expect(assigns(:tag)).to eq(tag)
       end
     end
@@ -109,7 +109,7 @@ describe TagsController do
 
       it "assigns the requested tag as @tag" do
         tag = FactoryBot.create(:tag)
-        get :edit, :id => tag.name
+        get :edit, params: { id: tag.name }
         expect(response).to be_forbidden
       end
     end
@@ -117,7 +117,7 @@ describe TagsController do
     describe "When not logged in" do
       it "should not assign the requested tag as @tag" do
         tag = FactoryBot.create(:tag)
-        get :edit, :id => tag.name
+        get :edit, params: { id: tag.name }
         expect(response).to redirect_to(new_user_session_url)
       end
     end
@@ -127,7 +127,7 @@ describe TagsController do
     before(:each) do
       @tag = FactoryBot.create(:tag)
       @attrs = FactoryBot.attributes_for(:tag)
-      @invalid_attrs = {:name => ''}
+      @invalid_attrs = {name: ''}
     end
 
     describe "When logged in as Administrator" do
@@ -135,11 +135,11 @@ describe TagsController do
 
       describe "with valid params" do
         it "updates the requested tag" do
-          put :update, :id => @tag.name, :tag => @attrs
+          put :update, params: { id: @tag.name, tag: @attrs }
         end
 
         it "assigns the requested tag as @tag" do
-          put :update, :id => @tag.name, :tag => @attrs
+          put :update, params: { id: @tag.name, tag: @attrs }
           expect(assigns(:tag)).to eq(@tag)
           expect(response).to redirect_to(assigns(:tag))
         end
@@ -147,11 +147,11 @@ describe TagsController do
 
       describe "with invalid params" do
         it "assigns the requested tag as @tag" do
-          put :update, :id => @tag.name, :tag => @invalid_attrs
+          put :update, params: { id: @tag.name, tag: @invalid_attrs }
         end
 
         it "re-renders the 'edit' template" do
-          put :update, :id => @tag.name, :tag => @invalid_attrs
+          put :update, params: { id: @tag.name, tag: @invalid_attrs }
           expect(response).to render_template("edit")
         end
       end
@@ -162,11 +162,11 @@ describe TagsController do
 
       describe "with valid params" do
         it "updates the requested tag" do
-          put :update, :id => @tag.name, :tag => @attrs
+          put :update, params: { id: @tag.name, tag: @attrs }
         end
 
         it "assigns the requested tag as @tag" do
-          put :update, :id => @tag.name, :tag => @attrs
+          put :update, params: { id: @tag.name, tag: @attrs }
           expect(assigns(:tag)).to eq(@tag)
           expect(response).to redirect_to(assigns(:tag))
         end
@@ -174,12 +174,12 @@ describe TagsController do
 
       describe "with invalid params" do
         it "assigns the tag as @tag" do
-          put :update, :id => @tag.name, :tag => @invalid_attrs
+          put :update, params: { id: @tag.name, tag: @invalid_attrs }
           expect(assigns(:tag)).not_to be_valid
         end
 
         it "re-renders the 'edit' template" do
-          put :update, :id => @tag.name, :tag => @invalid_attrs
+          put :update, params: { id: @tag.name, tag: @invalid_attrs }
           expect(response).to render_template("edit")
         end
       end
@@ -190,11 +190,11 @@ describe TagsController do
 
       describe "with valid params" do
         it "updates the requested tag" do
-          put :update, :id => @tag.name, :tag => @attrs
+          put :update, params: { id: @tag.name, tag: @attrs }
         end
 
         it "assigns the requested tag as @tag" do
-          put :update, :id => @tag.name, :tag => @attrs
+          put :update, params: { id: @tag.name, tag: @attrs }
           expect(assigns(:tag)).to eq(@tag)
           expect(response).to be_forbidden
         end
@@ -202,7 +202,7 @@ describe TagsController do
 
       describe "with invalid params" do
         it "assigns the requested tag as @tag" do
-          put :update, :id => @tag.name, :tag => @invalid_attrs
+          put :update, params: { id: @tag.name, tag: @invalid_attrs }
           expect(response).to be_forbidden
         end
       end
@@ -211,18 +211,18 @@ describe TagsController do
     describe "When not logged in" do
       describe "with valid params" do
         it "updates the requested tag" do
-          put :update, :id => @tag.name, :tag => @attrs
+          put :update, params: { id: @tag.name, tag: @attrs }
         end
 
         it "should be forbidden" do
-          put :update, :id => @tag.name, :tag => @attrs
+          put :update, params: { id: @tag.name, tag: @attrs }
           expect(response).to redirect_to(new_user_session_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested tag as @tag" do
-          put :update, :id => @tag.name, :tag => @invalid_attrs
+          put :update, params: { id: @tag.name, tag: @invalid_attrs }
           expect(response).to redirect_to(new_user_session_url)
         end
       end
@@ -238,11 +238,11 @@ describe TagsController do
       login_fixture_admin
 
       it "destroys the requested tag" do
-        delete :destroy, :id => @tag.name
+        delete :destroy, params: { id: @tag.name }
       end
 
       it "redirects to the tags list" do
-        delete :destroy, :id => @tag.name
+        delete :destroy, params: { id: @tag.name }
         expect(response).to redirect_to(tags_url)
       end
     end
@@ -251,11 +251,11 @@ describe TagsController do
       login_fixture_librarian
 
       it "destroys the requested tag" do
-        delete :destroy, :id => @tag.name
+        delete :destroy, params: { id: @tag.name }
       end
 
       it "redirects to the tags list" do
-        delete :destroy, :id => @tag.name
+        delete :destroy, params: { id: @tag.name }
         expect(response).to redirect_to(tags_url)
       end
     end
@@ -264,22 +264,22 @@ describe TagsController do
       login_fixture_user
 
       it "destroys the requested tag" do
-        delete :destroy, :id => @tag.name
+        delete :destroy, params: { id: @tag.name }
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @tag.name
+        delete :destroy, params: { id: @tag.name }
         expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "destroys the requested tag" do
-        delete :destroy, :id => @tag.name
+        delete :destroy, params: { id: @tag.name }
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @tag.name
+        delete :destroy, params: { id: @tag.name }
         expect(response).to redirect_to(new_user_session_url)
       end
     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 EnjuBookmark::EnjuUser

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

data/spec/dummy/bin/update

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a way to update your development environment automatically.
+  # Add necessary update steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  puts "\n== Updating database =="
+  system! 'bin/rails db:migrate'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

data/spec/dummy/bin/yarn

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+VENDOR_PATH = File.expand_path('..', __dir__)
+Dir.chdir(VENDOR_PATH) do
+  begin
+    exec "yarnpkg #{ARGV.join(" ")}"
+  rescue Errno::ENOENT
+    $stderr.puts "Yarn executable was not detected in the system."
+    $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
+    exit 1
+  end
+end

data/spec/dummy/config/application.rb

@@ -1,29 +1,19 @@
-require File.expand_path('../boot', __FILE__)
+require_relative 'boot'
 
 require 'rails/all'
 
 Bundler.require(*Rails.groups)
-require 'enju_bookmark'
-require 'enju_leaf'
-require 'globalize'
-require 'globalize-accessors'
+require "enju_bookmark"
+require "enju_leaf"
 
 module Dummy
   class Application < Rails::Application
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 5.1
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
   end
 end
 

data/spec/dummy/config/boot.rb

@@ -1,10 +1,5 @@
-require 'rubygems'
-gemfile = ENV['BUNDLE_GEMFILE'] || File.expand_path('../../../../Gemfile', __FILE__)
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__)
 
-if File.exist?(gemfile)
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler'
-  Bundler.setup
-end
-
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+$LOAD_PATH.unshift File.expand_path('../../../lib', __dir__)