Merge pull request #833 from rubyforgood/drop-pundit-shared-contexts

Drop pundit rspec shared contexts

Author: solebared

spec/policies/person_policy_spec.rb

@@ -1,22 +1,20 @@
 require 'rails_helper'
 
 RSpec.describe PersonPolicy do
-  subject { PersonPolicy.new(acting_user, person) }
+  subject { PersonPolicy.new(user, person) }
+
   let(:resolved_scope) {
-    PersonPolicy::Scope.new(acting_user, Person.all).resolve
+    PersonPolicy::Scope.new(user, Person.all).resolve
   }
 
-  shared_context "own Person" do
-    let(:person) { FactoryBot.create(:person, user: acting_user) }
-  end
-  shared_context "different Person" do
-    let(:person) { FactoryBot.create(:person) }
-  end
+  let(:user)         { create(:user) }
+  let(:own_person)   { create(:person, user: user) }
+  let(:other_person) { create(:person) }
+
 
   context "given a normal signed-in user and their Person" do
-    include_context "acting as signed-in user"
-    include_context "own Person"
-    
+    let(:person) { own_person }
+
     it { is_expected.to permit_action(:show) }
     it { is_expected.to permit_new_and_create_actions }
     it { is_expected.to permit_edit_and_update_actions }
@@ -28,9 +26,8 @@
   end
 
   context "given a normal signed-in user and a different Person" do
-    include_context "acting as signed-in user"
-    include_context "different Person"
-    
+    let(:person) { other_person }
+
     it { is_expected.to forbid_action(:show) }
     it { is_expected.to forbid_new_and_create_actions }
     it { is_expected.to forbid_edit_and_update_actions }
@@ -42,9 +39,9 @@
   end
 
   context "given a sysadmin and a their Person" do
-    include_context "acting as sysadmin"
-    include_context "own Person"
-    
+    let(:user) { create(:user, :sys_admin) }
+    let(:person) { own_person }
+
     it { is_expected.to permit_action(:show) }
     it { is_expected.to permit_new_and_create_actions }
     it { is_expected.to permit_edit_and_update_actions }
@@ -56,9 +53,9 @@
   end
 
   context "given a sysadmin and a different Person" do
-    include_context "acting as sysadmin"
-    include_context "different Person"
-    
+    let(:user) { create(:user, :sys_admin) }
+    let(:person) { other_person }
+
     it { is_expected.to permit_action(:show) }
     it { is_expected.to permit_new_and_create_actions }
     it { is_expected.to permit_edit_and_update_actions }
@@ -70,9 +67,9 @@
   end
 
   context "given an admin and their Person" do
-    include_context "acting as admin"
-    include_context "own Person"
-    
+    let(:user) { create(:user, :admin) }
+    let(:person) { own_person }
+
     it { is_expected.to permit_action(:show) }
     it { is_expected.to permit_new_and_create_actions }
     it { is_expected.to permit_edit_and_update_actions }
@@ -84,9 +81,9 @@
   end
 
   context "given an admin and a different Person" do
-    include_context "acting as admin"
-    include_context "different Person"
-    
+    let(:user) { create(:user, :admin) }
+    let(:person) { other_person }
+
     it { is_expected.to permit_action(:show) }
     it { is_expected.to forbid_new_and_create_actions }
     it { is_expected.to permit_edit_and_update_actions }

spec/policies/user_policy_spec.rb

@@ -1,22 +1,16 @@
 require 'rails_helper'
 
 RSpec.describe UserPolicy do
-  subject { UserPolicy.new(acting_user, target_user) }
+  subject { UserPolicy.new(current_user, target_user) }
+
   let(:resolved_scope) {
-    UserPolicy::Scope.new(acting_user, User.all).resolve
+    UserPolicy::Scope.new(current_user, User.all).resolve
   }
 
-  shared_context "own User" do
-    let(:target_user) { acting_user }
-  end
-  shared_context "different User" do
-    let(:target_user) { FactoryBot.create(:user) }
-  end
-
   context "given a normal signed-in user, targeting themselves" do
-    include_context "acting as signed-in user"
-    include_context "own User"
-    
+    let(:current_user) { create(:user) }
+    let(:target_user)  { current_user }
+
     it { is_expected.to permit_action(:show) }
     it { is_expected.to permit_new_and_create_actions }
     it { is_expected.to permit_edit_and_update_actions }
@@ -28,9 +22,9 @@
   end
 
   context "given a normal signed-in user and a different User" do
-    include_context "acting as signed-in user"
-    include_context "different User"
-    
+    let(:current_user) { create(:user) }
+    let(:target_user)  { create(:user) }
+
     it { is_expected.to forbid_action(:show) }
     it { is_expected.to permit_new_and_create_actions }
     it { is_expected.to forbid_edit_and_update_actions }
@@ -42,9 +36,9 @@
   end
 
   context "given a sysadmin and a their User" do
-    include_context "acting as sysadmin"
-    include_context "own User"
-    
+    let(:current_user) { create(:user, :sys_admin) }
+    let(:target_user)  { create(:user) }
+
     it { is_expected.to permit_action(:show) }
     it { is_expected.to permit_new_and_create_actions }
     it { is_expected.to permit_edit_and_update_actions }
@@ -56,9 +50,9 @@
   end
 
   context "given a sysadmin and a different User" do
-    include_context "acting as sysadmin"
-    include_context "different User"
-    
+    let(:current_user) { create(:user, :sys_admin) }
+    let(:target_user)  { create(:user) }
+
     it { is_expected.to permit_action(:show) }
     it { is_expected.to permit_new_and_create_actions }
     it { is_expected.to permit_edit_and_update_actions }
@@ -70,9 +64,9 @@
   end
 
   context "given an admin and their User" do
-    include_context "acting as admin"
-    include_context "own User"
-    
+    let(:current_user) { create(:user, :admin) }
+    let(:target_user)  { current_user }
+
     it { is_expected.to permit_action(:show) }
     it { is_expected.to permit_new_and_create_actions }
     it { is_expected.to permit_edit_and_update_actions }
@@ -84,9 +78,9 @@
   end
 
   context "given an admin and a different User" do
-    include_context "acting as admin"
-    include_context "different User"
-    
+    let(:current_user) { create(:user, :admin) }
+    let(:target_user)  { current_user }
+
     it { is_expected.to permit_action(:show) }
     it { is_expected.to permit_new_and_create_actions }
     it { is_expected.to permit_edit_and_update_actions }

spec/rails_helper.rb

@@ -23,7 +23,7 @@
 # directory. Alternatively, in the individual `*_spec.rb` files, manually
 # require only the support files necessary.
 #
-Dir[Rails.root.join('spec', 'support', '**', '*.rb')].sort.each { |f| require f }
+# Dir[Rails.root.join('spec', 'support', '**', '*.rb')].sort.each { |f| require f }
 
 # Checks for pending migrations and applies them before tests are run.
 # If you are not using ActiveRecord, you can remove these lines.
@@ -76,7 +76,3 @@
   # config.filter_gems_from_backtrace("gem name")
   #
 end
-
-Pundit::Matchers.configure do |config|
-  config.user_alias = :acting_user
-end

spec/requests/people_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe "/people", type: :request do
-  include_context "signed in as sysadmin"
+  before { sign_in FactoryBot.create(:user, :sys_admin) }
 
   describe 'GET /index' do
     let!(:people) { create_list(:person, 40) }

spec/requests/users_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe "/users", type: :request do
-  include_context "signed in as sysadmin"
+  before { sign_in FactoryBot.create(:user, :sys_admin) }
 
   describe "GET /index" do
     it "can render" do