hydra-role-management 0.2.1 → 1.0.3

data/spec/controllers/user_roles_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 describe UserRolesController do
   let(:ability) do
@@ -13,54 +13,54 @@ describe UserRolesController do
     Role.create(name: 'foo')
   end
 
-  before(:each) do 
+  before do
     @routes = Hydra::RoleManagement::Engine.routes
   end
 
-  describe "with a user who cannot edit users" do
-    it "should not be able to add a user" do
-      expect { post :create, role_id: role, user_key: 'foo@example.com'}.to raise_error CanCan::AccessDenied
+  describe 'with a user who cannot edit users' do
+    it 'is not able to add a user' do
+      expect { post :create, params: { role_id: role, user_key: 'foo@example.com' } }.to raise_error CanCan::AccessDenied
     end
-    it "should not be able to remove a user" do
-      expect { delete :destroy, role_id: role, id: 7}.to raise_error CanCan::AccessDenied
+    it 'is not able to remove a user' do
+      expect { delete :destroy, params: { role_id: role, id: 7 } }.to raise_error CanCan::AccessDenied
     end
   end
 
-  describe "with a user who can edit users" do
+  describe 'with a user who can edit users' do
     before do
       ability.can :read, Role
     end
-    describe "adding users" do
+    describe 'adding users' do
       before do
         ability.can :add_user, Role
       end
-      it "should not be able to add a user that doesn't exist" do
-        expect(User).to receive(:find_by_email).with('foo@example.com').and_return(nil)
-        post :create, role_id: role, user_key: 'foo@example.com'
-        expect(flash[:error]).to eq "Unable to find the user foo@example.com"
+      it "is not able to add a user that doesn't exist" do
+        allow(User).to receive(:find_by_email).and_return(nil)
+        post :create, params: { role_id: role, user_key: 'foo@example.com' }
+        expect(User).to have_received(:find_by_email).with('foo@example.com')
+        expect(flash[:error]).to eq 'Invalid user foo@example.com'
       end
-      it "should be able to add a user" do
+      it 'is able to add a user' do
         u = User.create!(email: 'foo@example.com', password: 'password', password_confirmation: 'password')
-        post :create, role_id: role, user_key: 'foo@example.com'
+        post :create, params: { role_id: role, user_key: 'foo@example.com' }
         expect(role.reload.users).to eq [u]
       end
     end
-    describe "removing users" do
+    describe 'removing users' do
       before do
         ability.can :remove_user, Role
       end
-      let (:user) do
+      let(:user) do
         u = User.new(email: 'foo@example.com', password: 'password', password_confirmation: 'password')
         u.roles = [role]
         u.save!
         u
       end
-      it "should be able to remove a user" do
+      it 'is able to remove a user' do
         expect(user.roles).to eq [role]
-        delete :destroy, role_id: role, id: user.id
+        delete :destroy, params: { role_id: role, id: user.id }
         expect(role.reload.users).to eq []
       end
     end
   end
 end
-

data/spec/lib/user_roles_spec.rb

@@ -1,54 +1,53 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 describe Hydra::RoleManagement::UserRoles do
   let(:librarian) { Role.create!(name: 'librarian') }
-  describe "a real user" do
-    subject do
+  describe 'a real user' do
+    subject(:user) do
       User.create!(email: 'fred@example.com', password: 'password')
     end
 
-    it "should have admin?" do
-      expect(subject).not_to be_admin
+    it 'has admin?' do
+      expect(user).not_to be_admin
     end
 
-    describe "with roles" do
+    describe 'with roles' do
       before do
-        subject.roles << librarian
+        user.roles << librarian
       end
 
-      its(:roles) { should eq [librarian] }
-      its(:groups) { should include('registered', 'librarian') }
+      its(:roles) { is_expected.to eq [librarian] }
+      its(:groups) { is_expected.to include('registered', 'librarian') }
     end
   end
 
-  describe "when DeviseGuests is installed" do
+  describe 'when DeviseGuests is installed' do
     before do
-      stub_const("DeviseGuests", true)
+      stub_const('DeviseGuests', true)
     end
 
-    describe "a real user" do
-      subject do
+    describe 'a real user' do
+      subject(:user) do
         User.create!(email: 'fred@example.com', password: 'password')
       end
 
-      it { should_not be_admin }
+      it { is_expected.not_to be_admin }
 
-      describe "with roles" do
+      describe 'with roles' do
         before do
-          subject.roles << librarian
+          user.roles << librarian
         end
 
-        its(:groups) { should include('registered', 'librarian') }
+        its(:groups) { is_expected.to include('registered', 'librarian') }
       end
     end
-    describe "a guest user" do
-      subject do
+    describe 'a guest user' do
+      subject(:user) do
         User.create!(email: 'fred@example.com', password: 'password', guest: true)
       end
 
-      it { should_not be_admin }
-      its(:groups) { should be_empty }
+      it { is_expected.not_to be_admin }
+      its(:groups) { is_expected.to be_empty }
     end
   end
-
 end

data/spec/models/role_spec.rb

@@ -1,35 +1,36 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 describe Role do
-  it "should require a name" do
-    expect(subject).not_to be_valid
-    subject.name = 'foo'
-    expect(subject).to be_valid
+  subject(:role) { described_class.new }
+  it 'requires a name' do
+    expect(role).not_to be_valid
+    role.name = 'foo'
+    expect(role).to be_valid
   end
 
-  it "should not allow space in the name" do
-    subject.name = 'foo bar'
-    expect(subject).not_to be_valid
+  it 'does not allow space in the name' do
+    role.name = 'foo bar'
+    expect(role).not_to be_valid
   end
 
-  it "should not allow comma in the name" do
-    subject.name = 'foo,bar'
-    expect(subject).not_to be_valid
+  it 'does not allow comma in the name' do
+    role.name = 'foo,bar'
+    expect(role).not_to be_valid
   end
 
-  it "should not allow ampersand in the name" do
-    subject.name = 'foo&bar'
-    expect(subject).not_to be_valid
+  it 'does not allow ampersand in the name' do
+    role.name = 'foo&bar'
+    expect(role).not_to be_valid
   end
 
-  it "should not allow less-than in the name" do
-    subject.name = 'foo<bar'
-    expect(subject).not_to be_valid
+  it 'does not allow less-than in the name' do
+    role.name = 'foo<bar'
+    expect(role).not_to be_valid
   end
 
-  it "should validate uniqueness" do
-    subject.name ='foo'
-    subject.save!
-    expect(Role.new(name: 'foo')).not_to be_valid
+  it 'validates uniqueness' do
+    role.name = 'foo'
+    role.save!
+    expect(described_class.new(name: 'foo')).not_to be_valid
   end
 end

data/spec/routing/role_management_routes_spec.rb

@@ -1,66 +1,50 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
-describe "Routes for role_management" do
-  routes {
-    Hydra::RoleManagement::Engine.routes 
-  }
-  context "default" do
-    it "should route index" do 
-      expect(:get => '/roles').to route_to( :controller => "roles", :action => "index")
+describe 'Routes for role_management', type: :routing do
+  routes { Hydra::RoleManagement::Engine.routes }
+
+  context 'when using the default engine routes' do
+    it 'routes to the index action' do
+      expect(get: '/roles').to route_to(controller: 'roles', action: 'index')
     end
-    it "should create roles" do 
-      expect(:post => '/roles').to route_to( :controller => "roles", :action => "create")
+    it 'routes create action' do
+      expect(post: '/roles').to route_to(controller: 'roles', action: 'create')
     end
-    it "should show roles" do 
-      expect(:get => '/roles/7').to route_to( :controller => "roles", :action => "show", :id => '7')
+    it 'routes to the show action' do
+      expect(get: '/roles/7').to route_to(controller: 'roles', action: 'show', id: '7')
     end
-    it "should add users" do 
-      expect(:post => '/roles/7/users').to route_to( :controller => "user_roles", :role_id=>'7', :action => "create")
+    it 'routes to the create action for creating a new user' do
+      expect(post: '/roles/7/users').to route_to(controller: 'user_roles', role_id: '7', action: 'create')
     end
-    it "should remove users" do 
-      expect(:delete => '/roles/7/users/5').to route_to( :controller => "user_roles", :role_id=>'7', :id=>'5', :action => "destroy")
+    it 'routes to the delete action for deleting an existing user' do
+      expect(delete: '/roles/7/users/5').to route_to(controller: 'user_roles', role_id: '7', id: '5', action: 'destroy')
     end
   end
 
-  context "specific" do
-    before(:all) do
-      @routes_rb = File.join(Rails.root,'config/routes.rb')
-      @routes_rb_content = File.read(@routes_rb)
-      File.open(@routes_rb,'w') do |f|
-        f.write @routes_rb_content.sub(
-          /mount Hydra::RoleManagement::Engine => '\/'/,
-          "Hydra::RoleManagement.draw_routes(self, path: '/admin/groups')"
-        )
-      end
+  context 'when customizing the engine routes' do
+    before do
+      routes.draw { Hydra::RoleManagement.draw_routes(self, path: '/admin/groups') }
       Rails.application.reload_routes!
     end
 
-    before(:each) do
-      @routes = Hydra::RoleManagement::Engine.routes 
-      # so we have to do this instead:
-      # engine routes broke in rspec rails 2.12.1, so we had to add this:
-      assertion_instance.instance_variable_set(:@routes, @routes)
-    end
-
-    after(:all) do
-      File.open(@routes_rb,'w') { |f| f.write(@routes_rb_content) }
+    after do
       Rails.application.reload_routes!
     end
 
-    it "should route index" do 
-      expect(:get => '/admin/groups').to route_to( :controller => "roles", :action => "index")
+    it 'routes to the index action' do
+      expect(get: '/admin/groups').to route_to(controller: 'roles', action: 'index')
     end
-    it "should create roles" do 
-      expect(:post => '/admin/groups').to route_to( :controller => "roles", :action => "create")
+    it 'routes create action' do
+      expect(post: '/admin/groups').to route_to(controller: 'roles', action: 'create')
     end
-    it "should show roles" do 
-      expect(:get => '/admin/groups/7').to route_to( :controller => "roles", :action => "show", :id => '7')
+    it 'routes to the show action' do
+      expect(get: '/admin/groups/7').to route_to(controller: 'roles', action: 'show', id: '7')
     end
-    it "should add users" do 
-      expect(:post => '/admin/groups/7/users').to route_to( :controller => "user_roles", :role_id=>'7', :action => "create")
+    it 'routes to the create action for creating a new user' do
+      expect(post: '/admin/groups/7/users').to route_to(controller: 'user_roles', role_id: '7', action: 'create')
     end
-    it "should remove users" do 
-      expect(:delete => '/admin/groups/7/users/5').to route_to( :controller => "user_roles", :role_id=>'7', :id=>'5', :action => "destroy")
+    it 'routes to the delete action for deleting an existing user' do
+      expect(delete: '/admin/groups/7/users/5').to route_to(controller: 'user_roles', role_id: '7', id: '5', action: 'destroy')
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,16 +1,25 @@
-require "bundler/setup"
-ENV["RAILS_ENV"] ||= 'test'
+# frozen_string_literal: true
 
+require 'coveralls'
+Coveralls.wear!
+
+ENV['RAILS_ENV'] ||= 'test'
+require 'bundler/setup'
 
 require 'engine_cart'
 EngineCart.load_application!
+
+require 'rails-controller-testing'
 require 'rspec/rails'
+require 'rspec/its'
 require 'hydra/role_management'
+require 'pry-byebug'
 
 RSpec.configure do |config|
   config.use_transactional_fixtures = true
-  config.before(:each, :type=>"controller") { @routes = Hydra::RoleManagement::Engine.routes }
-  config.include Devise::TestHelpers, :type => :controller
-
+  config.before(:each, type: :controller) do
+    @routes = Hydra::RoleManagement::Engine.routes
+  end
+  config.include Devise::Test::ControllerHelpers, type: :controller
   config.infer_spec_type_from_file_location!
 end

data/spec/test_app_templates/app/models/sample.rb

@@ -1,24 +1,26 @@
+# frozen_string_literal: true
+
 class Sample
   # This is a stub model for testing.
 
   cattr_accessor :objects
   self.objects = {}
 
-  def self.create(params={})
+  def self.create(_params = {})
     obj = Sample.new
     obj.save
     obj
   end
 
-  def save()
+  def save
     @pid ||= "sample:#{(rand * 1000).to_i}"
     self.class.objects[@pid] = self
   end
 
   def update_attributes(attributes)
     attributes.each do |k, v|
-      instance_variable_set "@#{k.to_s}".to_sym, v
-      
+      instance_variable_set "@#{k}".to_sym, v
+
       self.class.send :attr_accessor, k
     end
   end
@@ -27,10 +29,8 @@ class Sample
     objects[pid]
   end
 
-  def pid
-    @pid
-  end
-  
+  attr_reader :pid
+
   def destroy
     self.class.objects.delete(@pid)
   end

data/spec/test_app_templates/app/models/solr_document.rb

@@ -1,5 +1,6 @@
-# -*- encoding : utf-8 -*-
-class SolrDocument 
 
+# frozen_string_literal: true
+
+class SolrDocument
   include Blacklight::Solr::Document
 end

data/spec/test_app_templates/config/initializers/hydra_config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The following lines determine which user attributes your hydrangea app will use
 # This configuration allows you to use the out of the box ActiveRecord associations between users and user_attributes
 # It also allows you to specify your own user attributes
@@ -17,12 +19,11 @@ if Hydra.respond_to?(:configure)
     # If you change these, you must also update the permissions request handler in your solrconfig.xml to return those values
     indexer = Solrizer::Descriptor.new(:string, :stored, :indexed, :multivalued)
     config[:permissions] = {
-      :discover => {:group =>ActiveFedora::SolrService.solr_name("discover_access_group", indexer), :individual=>ActiveFedora::SolrService.solr_name("discover_access_person", indexer)},
-      :read => {:group =>ActiveFedora::SolrService.solr_name("read_access_group", indexer), :individual=>ActiveFedora::SolrService.solr_name("read_access_person", indexer)},
-      :edit => {:group =>ActiveFedora::SolrService.solr_name("edit_access_group", indexer), :individual=>ActiveFedora::SolrService.solr_name("edit_access_person", indexer)},
-      :owner => ActiveFedora::SolrService.solr_name("depositor", indexer),
-      :embargo_release_date => ActiveFedora::SolrService.solr_name("embargo_release_date", Solrizer::Descriptor.new(:date, :stored, :indexed))
+      discover: { group: ActiveFedora::SolrService.solr_name('discover_access_group', indexer), individual: ActiveFedora::SolrService.solr_name('discover_access_person', indexer) },
+      read: { group: ActiveFedora::SolrService.solr_name('read_access_group', indexer), individual: ActiveFedora::SolrService.solr_name('read_access_person', indexer) },
+      edit: { group: ActiveFedora::SolrService.solr_name('edit_access_group', indexer), individual: ActiveFedora::SolrService.solr_name('edit_access_person', indexer) },
+      owner: ActiveFedora::SolrService.solr_name('depositor', indexer),
+      embargo_release_date: ActiveFedora::SolrService.solr_name('embargo_release_date', Solrizer::Descriptor.new(:date, :stored, :indexed))
     }
-    
   end
 end

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

@@ -1,30 +1,27 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 
 class TestAppGenerator < Rails::Generators::Base
-  source_root File.expand_path("../../../../test_app_templates", __FILE__)
+  source_root './spec/test_app_templates'
+
   def add_gems
-    gem 'blacklight', ">= 5.4"
+    gem 'blacklight', '>= 6.9.0'
   end
-  
+
   def run_blacklight_generator
-    say_status("warning", "GENERATING BL", :yellow)       
+    say_status('warning', 'GENERATING BL', :yellow)
 
     generate 'blacklight:install', '--devise'
   end
 
   def run_cancan_generator
-    say_status("warning", "GENERATING Ability", :yellow)       
+    say_status('warning', 'GENERATING Ability', :yellow)
     generate 'cancan:ability'
   end
 
   def run_roles_generator
-    say_status("warning", "GENERATING ROLES", :yellow)       
-
+    say_status('warning', 'GENERATING ROLES', :yellow)
     generate 'roles', '-f'
-
-  end
-
-  def copy_rspec_rake_task
-    copy_file "lib/tasks/rspec.rake"
   end
 end