scimitar 1.7.1 → 2.0.0

data/spec/requests/active_record_backed_resources_controller_spec.rb

@@ -1,42 +1,25 @@
 require 'spec_helper'
-require 'time'
 
 RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
   before :each do
     allow_any_instance_of(Scimitar::ApplicationController).to receive(:authenticated?).and_return(true)
 
-    # If a sort order is unspecified, the controller defaults to ID ascending.
-    # With UUID based IDs, testing life is made easier by ensuring that the
-    # creation order matches an ascending UUID sort order (which is what would
-    # happen if we were using integer primary keys).
-    #
-    lmt = Time.parse("2023-01-09 14:25:00 +1300")
-    ids = 3.times.map { SecureRandom.uuid }.sort()
-
-    @u1 = MockUser.create(primary_key: ids.shift(), username: '1', first_name: 'Foo', last_name: 'Ark', home_email_address: 'home_1@test.com', scim_uid: '001', created_at: lmt, updated_at: lmt + 1)
-    @u2 = MockUser.create(primary_key: ids.shift(), username: '2', first_name: 'Foo', last_name: 'Bar', home_email_address: 'home_2@test.com', scim_uid: '002', created_at: lmt, updated_at: lmt + 2)
-    @u3 = MockUser.create(primary_key: ids.shift(), username: '3', first_name: 'Foo',                   home_email_address: 'home_3@test.com', scim_uid: '003', created_at: lmt, updated_at: lmt + 3)
-
-    @g1 = MockGroup.create!(display_name: 'Group 1')
-    @g2 = MockGroup.create!(display_name: 'Group 2')
-    @g3 = MockGroup.create!(display_name: 'Group 3')
+    @u1 = MockUser.create(username: '1', first_name: 'Foo', last_name: 'Ark', home_email_address: 'home_1@test.com')
+    @u2 = MockUser.create(username: '2', first_name: 'Foo', last_name: 'Bar', home_email_address: 'home_2@test.com')
+    @u3 = MockUser.create(username: '3', first_name: 'Foo',                   home_email_address: 'home_3@test.com')
   end
 
   # ===========================================================================
 
   context '#index' do
     context 'with no items' do
-      before :each do
+      it 'returns empty list' do
         MockUser.delete_all
-      end
 
-      it 'returns empty list' do
         expect_any_instance_of(MockUsersController).to receive(:index).once.and_call_original
         get '/Users', params: { format: :scim }
 
-        expect(response.status                 ).to eql(200)
-        expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
+        expect(response.status).to eql(200)
         result = JSON.parse(response.body)
 
         expect(result['totalResults']).to eql(0)
@@ -46,172 +29,55 @@ RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
     end # "context 'with no items' do"
 
     context 'with items' do
-      context 'with a UUID, renamed primary key column' do
-        it 'returns all items' do
-          get '/Users', params: { format: :scim }
-
-          expect(response.status                 ).to eql(200)
-          expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
-          result = JSON.parse(response.body)
-
-          expect(result['totalResults']).to eql(3)
-          expect(result['Resources'].size).to eql(3)
-
-          ids = result['Resources'].map { |resource| resource['id'] }
-          expect(ids).to match_array([@u1.primary_key.to_s, @u2.primary_key.to_s, @u3.primary_key.to_s])
-
-          usernames = result['Resources'].map { |resource| resource['userName'] }
-          expect(usernames).to match_array(['1', '2', '3'])
-        end
-      end # "context 'with a UUID, renamed primary key column' do"
-
-      context 'with an integer, conventionally named primary key column' do
-        it 'returns all items' do
-          get '/Groups', params: { format: :scim }
-
-          expect(response.status                 ).to eql(200)
-          expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
-          result = JSON.parse(response.body)
-
-          expect(result['totalResults']).to eql(3)
-          expect(result['Resources'].size).to eql(3)
-
-          ids = result['Resources'].map { |resource| resource['id'] }
-          expect(ids).to match_array([@g1.id.to_s, @g2.id.to_s, @g3.id.to_s])
-
-          usernames = result['Resources'].map { |resource| resource['displayName'] }
-          expect(usernames).to match_array(['Group 1', 'Group 2', 'Group 3'])
-        end
-      end # "context 'with an integer, conventionally named primary key column' do"
-
-      it 'applies a filter, with case-insensitive value comparison' do
-        get '/Users', params: {
-          format: :scim,
-          filter: 'name.givenName eq "FOO" and name.familyName pr and emails ne "home_1@test.com"'
-        }
-
-        expect(response.status                 ).to eql(200)
-        expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
+      it 'returns all items' do
+        get '/Users', params: { format: :scim }
 
+        expect(response.status).to eql(200)
         result = JSON.parse(response.body)
 
-        expect(result['totalResults']).to eql(1)
-        expect(result['Resources'].size).to eql(1)
+        expect(result['totalResults']).to eql(3)
+        expect(result['Resources'].size).to eql(3)
 
         ids = result['Resources'].map { |resource| resource['id'] }
-        expect(ids).to match_array([@u2.primary_key.to_s])
+        expect(ids).to match_array([@u1.id.to_s, @u2.id.to_s, @u3.id.to_s])
 
         usernames = result['Resources'].map { |resource| resource['userName'] }
-        expect(usernames).to match_array(['2'])
+        expect(usernames).to match_array(['1', '2', '3'])
       end
 
-      it 'applies a filter, with case-insensitive attribute matching (GitHub issue #37)' do
+      it 'applies a filter, with case-insensitive value comparison' do
         get '/Users', params: {
           format: :scim,
-          filter: 'name.GIVENNAME eq "Foo" and name.Familyname pr and emails ne "home_1@test.com"'
+          filter: 'name.givenName eq "Foo" and name.familyName pr and emails ne "home_1@TEST.COM"'
         }
 
-        expect(response.status                 ).to eql(200)
-        expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
+        expect(response.status).to eql(200)
         result = JSON.parse(response.body)
 
         expect(result['totalResults']).to eql(1)
         expect(result['Resources'].size).to eql(1)
 
         ids = result['Resources'].map { |resource| resource['id'] }
-        expect(ids).to match_array([@u2.primary_key.to_s])
+        expect(ids).to match_array([@u2.id.to_s])
 
         usernames = result['Resources'].map { |resource| resource['userName'] }
         expect(usernames).to match_array(['2'])
       end
 
-      # Strange attribute capitalisation in tests here builds on test coverage
-      # for now-fixed GitHub issue #37.
-      #
-      context '"meta" / IDs (GitHub issue #36)' do
-        it 'applies a filter on primary keys, using direct comparison (rather than e.g. case-insensitive operators)' do
-          get '/Users', params: {
-            format: :scim,
-            filter: "id eq \"#{@u3.primary_key}\""
-          }
-
-          expect(response.status                 ).to eql(200)
-          expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
-          result = JSON.parse(response.body)
-
-          expect(result['totalResults']).to eql(1)
-          expect(result['Resources'].size).to eql(1)
-
-          ids = result['Resources'].map { |resource| resource['id'] }
-          expect(ids).to match_array([@u3.primary_key.to_s])
-
-          usernames = result['Resources'].map { |resource| resource['userName'] }
-          expect(usernames).to match_array(['3'])
-        end
-
-        it 'applies a filter on external IDs, using direct comparison' do
-          get '/Users', params: {
-            format: :scim,
-            filter: "externalID eq \"#{@u2.scim_uid}\""
-          }
-
-          expect(response.status                 ).to eql(200)
-          expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
-          result = JSON.parse(response.body)
-
-          expect(result['totalResults']).to eql(1)
-          expect(result['Resources'].size).to eql(1)
-
-          ids = result['Resources'].map { |resource| resource['id'] }
-          expect(ids).to match_array([@u2.primary_key.to_s])
-
-          usernames = result['Resources'].map { |resource| resource['userName'] }
-          expect(usernames).to match_array(['2'])
-        end
-
-        it 'applies a filter on "meta" entries, using direct comparison' do
-          get '/Users', params: {
-            format: :scim,
-            filter: "Meta.LastModified eq \"#{@u3.updated_at}\""
-          }
-
-          expect(response.status                 ).to eql(200)
-          expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
-          result = JSON.parse(response.body)
-
-          expect(result['totalResults']).to eql(1)
-          expect(result['Resources'].size).to eql(1)
-
-          ids = result['Resources'].map { |resource| resource['id'] }
-          expect(ids).to match_array([@u3.primary_key.to_s])
-
-          usernames = result['Resources'].map { |resource| resource['userName'] }
-          expect(usernames).to match_array(['3'])
-        end
-      end # "context '"meta" / IDs (GitHub issue #36)' do"
-
       it 'obeys a page size' do
         get '/Users', params: {
           format: :scim,
           count:  2
         }
 
-        expect(response.status                 ).to eql(200)
-        expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
+        expect(response.status).to eql(200)
         result = JSON.parse(response.body)
 
         expect(result['totalResults']).to eql(3)
         expect(result['Resources'].size).to eql(2)
 
         ids = result['Resources'].map { |resource| resource['id'] }
-        expect(ids).to match_array([@u1.primary_key.to_s, @u2.primary_key.to_s])
+        expect(ids).to match_array([@u1.id.to_s, @u2.id.to_s])
 
         usernames = result['Resources'].map { |resource| resource['userName'] }
         expect(usernames).to match_array(['1', '2'])
@@ -223,16 +89,14 @@ RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
           startIndex: 2
         }
 
-        expect(response.status                 ).to eql(200)
-        expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
+        expect(response.status).to eql(200)
         result = JSON.parse(response.body)
 
         expect(result['totalResults']).to eql(3)
         expect(result['Resources'].size).to eql(2)
 
         ids = result['Resources'].map { |resource| resource['id'] }
-        expect(ids).to match_array([@u2.primary_key.to_s, @u3.primary_key.to_s])
+        expect(ids).to match_array([@u2.id.to_s, @u3.id.to_s])
 
         usernames = result['Resources'].map { |resource| resource['userName'] }
         expect(usernames).to match_array(['2', '3'])
@@ -246,11 +110,8 @@ RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
           filter: 'name.givenName'
         }
 
-        expect(response.status                 ).to eql(400)
-        expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
+        expect(response.status).to eql(400)
         result = JSON.parse(response.body)
-
         expect(result['scimType']).to eql('invalidFilter')
       end
     end # "context 'with bad calls' do"
@@ -259,47 +120,24 @@ RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
   # ===========================================================================
 
   context '#show' do
-    context 'with a UUID, renamed primary key column' do
-      it 'shows an item' do
-        expect_any_instance_of(MockUsersController).to receive(:show).once.and_call_original
-        get "/Users/#{@u2.primary_key}", params: { format: :scim }
-
-        expect(response.status                 ).to eql(200)
-        expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
-        result = JSON.parse(response.body)
-
-        expect(result['id']).to eql(@u2.primary_key.to_s)
-        expect(result['userName']).to eql('2')
-        expect(result['name']['familyName']).to eql('Bar')
-        expect(result['meta']['resourceType']).to eql('User')
-      end
-    end # "context 'with a UUID, renamed primary key column' do"
-
-    context 'with an integer, conventionally named primary key column' do
-      it 'shows an item' do
-        expect_any_instance_of(MockGroupsController).to receive(:show).once.and_call_original
-        get "/Groups/#{@g2.id}", params: { format: :scim }
-
-        expect(response.status                 ).to eql(200)
-        expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
+    it 'shows an item' do
+      expect_any_instance_of(MockUsersController).to receive(:show).once.and_call_original
+      get "/Users/#{@u2.id}", params: { format: :scim }
 
-        result = JSON.parse(response.body)
+      expect(response.status).to eql(200)
+      result = JSON.parse(response.body)
 
-        expect(result['id']).to eql(@g2.id.to_s) # Note - ID was converted String; not Integer
-        expect(result['displayName']).to eql('Group 2')
-        expect(result['meta']['resourceType']).to eql('Group')
-      end
-    end # "context 'with an integer, conventionally named primary key column' do"
+      expect(result['id']).to eql(@u2.id.to_s) # Note - ID was converted String; not Integer
+      expect(result['userName']).to eql('2')
+      expect(result['name']['familyName']).to eql('Bar')
+      expect(result['meta']['resourceType']).to eql('User')
+    end
 
     it 'renders 404' do
       get '/Users/xyz', params: { format: :scim }
 
-      expect(response.status                 ).to eql(404)
-      expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
+      expect(response.status).to eql(404)
       result = JSON.parse(response.body)
-
       expect(result['status']).to eql('404')
     end
   end # "context '#show' do"
@@ -312,7 +150,7 @@ RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
         it 'with minimal parameters' do
           mock_before = MockUser.all.to_a
 
-          attributes = { userName: '4' } # Minimum required by schema
+          attributes = { userName: '4' }  # Minimum required by schema
           attributes = spec_helper_hupcase(attributes) if force_upper_case
 
           expect_any_instance_of(MockUsersController).to receive(:create).once.and_call_original
@@ -323,12 +161,10 @@ RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
           mock_after = MockUser.all.to_a
           new_mock = (mock_after - mock_before).first
 
-          expect(response.status                 ).to eql(201)
-          expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
+          expect(response.status).to eql(201)
           result = JSON.parse(response.body)
 
-          expect(result['id']).to eql(new_mock.primary_key.to_s)
+          expect(result['id']).to eql(new_mock.id.to_s)
           expect(result['meta']['resourceType']).to eql('User')
           expect(new_mock.username).to eql('4')
         end
@@ -344,7 +180,6 @@ RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
               givenName: 'Given',
               familyName: 'Family'
             },
-            meta: { resourceType: 'User' },
             emails: [
               {
                 type: 'work',
@@ -366,9 +201,7 @@ RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
           mock_after = MockUser.all.to_a
           new_mock = (mock_after - mock_before).first
 
-          expect(response.status                 ).to eql(201)
-          expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
+          expect(response.status).to eql(201)
           result = JSON.parse(response.body)
 
           expect(result['id']).to eql(new_mock.id.to_s)
@@ -399,11 +232,8 @@ RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
         }
       }.to_not change { MockUser.count }
 
-      expect(response.status                 ).to eql(409)
-      expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
+      expect(response.status).to eql(409)
       result = JSON.parse(response.body)
-
       expect(result['scimType']).to eql('uniqueness')
       expect(result['detail']).to include('already been taken')
     end
@@ -416,11 +246,8 @@ RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
         }
       }.to_not change { MockUser.count }
 
-      expect(response.status                 ).to eql(400)
-      expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
+      expect(response.status).to eql(400)
       result = JSON.parse(response.body)
-
       expect(result['scimType']).to eql('invalidValue')
       expect(result['detail']).to include('is required')
     end
@@ -433,32 +260,12 @@ RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
         }
       }.to_not change { MockUser.count }
 
-      expect(response.status                 ).to eql(400)
-      expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
+      expect(response.status).to eql(400)
       result = JSON.parse(response.body)
 
       expect(result['scimType']).to eql('invalidValue')
       expect(result['detail']).to include('is reserved')
     end
-
-    it 'invokes a block if given one' do
-      mock_before = MockUser.all.to_a
-      attributes = { userName: '5' } # Minimum required by schema
-
-      expect_any_instance_of(CustomSaveMockUsersController).to receive(:create).once.and_call_original
-      expect {
-        post "/CustomSaveUsers", params: attributes.merge(format: :scim)
-      }.to change { MockUser.count }.by(1)
-
-      mock_after = MockUser.all.to_a
-      new_mock = (mock_after - mock_before).first
-
-      expect(response.status                 ).to eql(201)
-      expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
-      expect(new_mock.username).to eql(CustomSaveMockUsersController::CUSTOM_SAVE_BLOCK_USERNAME_INDICATOR)
-    end
   end # "context '#create' do"
 
   # ===========================================================================
@@ -471,15 +278,13 @@ RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
 
         expect_any_instance_of(MockUsersController).to receive(:replace).once.and_call_original
         expect {
-          put "/Users/#{@u2.primary_key}", params: attributes.merge(format: :scim)
+          put "/Users/#{@u2.id}", params: attributes.merge(format: :scim)
         }.to_not change { MockUser.count }
 
-        expect(response.status                 ).to eql(200)
-        expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
+        expect(response.status).to eql(200)
         result = JSON.parse(response.body)
 
-        expect(result['id']).to eql(@u2.primary_key.to_s)
+        expect(result['id']).to eql(@u2.id.to_s)
         expect(result['meta']['resourceType']).to eql('User')
 
         @u2.reload
@@ -501,17 +306,14 @@ RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
 
     it 'notes schema validation failures' do
       expect {
-        put "/Users/#{@u2.primary_key}", params: {
+        put "/Users/#{@u2.id}", params: {
           format: :scim
           # userName parameter is required by schema, but missing
         }
       }.to_not change { MockUser.count }
 
-      expect(response.status                 ).to eql(400)
-      expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
+      expect(response.status).to eql(400)
       result = JSON.parse(response.body)
-
       expect(result['scimType']).to eql('invalidValue')
       expect(result['detail']).to include('is required')
 
@@ -531,9 +333,7 @@ RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
         }
       }.to_not change { MockUser.count }
 
-      expect(response.status                 ).to eql(400)
-      expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
+      expect(response.status).to eql(400)
       result = JSON.parse(response.body)
 
       expect(result['scimType']).to eql('invalidValue')
@@ -555,11 +355,8 @@ RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
         }
       }.to_not change { MockUser.count }
 
-      expect(response.status                 ).to eql(404)
-      expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
+      expect(response.status).to eql(404)
       result = JSON.parse(response.body)
-
       expect(result['status']).to eql('404')
     end
   end # "context '#replace' do"
@@ -588,15 +385,13 @@ RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
 
         expect_any_instance_of(MockUsersController).to receive(:update).once.and_call_original
         expect {
-          patch "/Users/#{@u2.primary_key}", params: payload.merge(format: :scim)
+          patch "/Users/#{@u2.id}", params: payload.merge(format: :scim)
         }.to_not change { MockUser.count }
 
-        expect(response.status                 ).to eql(200)
-        expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
+        expect(response.status).to eql(200)
         result = JSON.parse(response.body)
 
-        expect(result['id']).to eql(@u2.primary_key.to_s)
+        expect(result['id']).to eql(@u2.id.to_s)
         expect(result['meta']['resourceType']).to eql('User')
 
         @u2.reload
@@ -627,15 +422,13 @@ RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
 
           expect_any_instance_of(MockUsersController).to receive(:update).once.and_call_original
           expect {
-            patch "/Users/#{@u2.primary_key}", params: payload.merge(format: :scim)
+            patch "/Users/#{@u2.id}", params: payload.merge(format: :scim)
           }.to_not change { MockUser.count }
 
-          expect(response.status                 ).to eql(200)
-          expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
+          expect(response.status).to eql(200)
           result = JSON.parse(response.body)
 
-          expect(result['id']).to eql(@u2.primary_key.to_s)
+          expect(result['id']).to eql(@u2.id.to_s)
           expect(result['meta']['resourceType']).to eql('User')
 
           @u2.reload
@@ -661,15 +454,13 @@ RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
 
           expect_any_instance_of(MockUsersController).to receive(:update).once.and_call_original
           expect {
-            patch "/Users/#{@u2.primary_key}", params: payload.merge(format: :scim)
+            patch "/Users/#{@u2.id}", params: payload.merge(format: :scim)
           }.to_not change { MockUser.count }
 
-          expect(response.status                 ).to eql(200)
-          expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
+          expect(response.status).to eql(200)
           result = JSON.parse(response.body)
 
-          expect(result['id']).to eql(@u2.primary_key.to_s)
+          expect(result['id']).to eql(@u2.id.to_s)
           expect(result['meta']['resourceType']).to eql('User')
 
           @u2.reload
@@ -695,15 +486,13 @@ RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
 
           expect_any_instance_of(MockUsersController).to receive(:update).once.and_call_original
           expect {
-            patch "/Users/#{@u2.primary_key}", params: payload.merge(format: :scim)
+            patch "/Users/#{@u2.id}", params: payload.merge(format: :scim)
           }.to_not change { MockUser.count }
 
-          expect(response.status                 ).to eql(200)
-          expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
+          expect(response.status).to eql(200)
           result = JSON.parse(response.body)
 
-          expect(result['id']).to eql(@u2.primary_key.to_s)
+          expect(result['id']).to eql(@u2.id.to_s)
           expect(result['meta']['resourceType']).to eql('User')
 
           @u2.reload
@@ -727,7 +516,7 @@ RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
 
     it 'notes Rails validation failures' do
       expect {
-        patch "/Users/#{@u2.primary_key}", params: {
+        patch "/Users/#{@u2.id}", params: {
           format: :scim,
           Operations: [
             {
@@ -739,9 +528,7 @@ RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
         }
       }.to_not change { MockUser.count }
 
-      expect(response.status                 ).to eql(400)
-      expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
+      expect(response.status).to eql(400)
       result = JSON.parse(response.body)
 
       expect(result['scimType']).to eql('invalidValue')
@@ -769,153 +556,10 @@ RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
         }
       }.to_not change { MockUser.count }
 
-      expect(response.status                 ).to eql(404)
-      expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
+      expect(response.status).to eql(404)
       result = JSON.parse(response.body)
-
       expect(result['status']).to eql('404')
     end
-
-    context 'when removing users from groups' do
-      before :each do
-        @g1.mock_users << @u1
-        @g1.mock_users << @u2
-        @g1.mock_users << @u3
-
-        # (Self-check) Verify group representation
-        #
-        get "/Groups/#{@g1.id}", params: { format: :scim }
-
-        expect(response.status).to eql(200)
-        result = JSON.parse(response.body)
-
-        expect(result['members'].map { |m| m['value'] }.sort()).to eql(MockUser.pluck(:primary_key).sort())
-      end
-
-      it 'can remove all users' do
-        expect {
-          expect {
-            patch "/Groups/#{@g1.id}", params: {
-              format: :scim,
-              Operations: [
-                {
-                  op: 'remove',
-                  path: 'members'
-                }
-              ]
-            }
-          }.to_not change { MockUser.count }
-        }.to_not change { MockGroup.count }
-
-        get "/Groups/#{@g1.id}", params: { format: :scim }
-
-        expect(response.status                 ).to eql(200)
-        expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
-        result = JSON.parse(response.body)
-
-        expect(result['members']).to be_empty
-        expect(@g1.reload().mock_users).to be_empty
-      end
-
-      # Define via 'let':
-      #
-      # * Hash 'payload', to send via 'patch'
-      # * MockUser 'removed_user', which is the user that should be removed
-      #
-      shared_examples 'a user remover' do
-        it 'which removes the identified user' do
-          expect {
-            expect {
-              patch "/Groups/#{@g1.id}", params: payload()
-            }.to_not change { MockUser.count }
-          }.to_not change { MockGroup.count }
-
-          expected_remaining_user_ids = MockUser
-            .where.not(primary_key: removed_user().id)
-            .pluck(:primary_key)
-            .sort()
-
-          get "/Groups/#{@g1.id}", params: { format: :scim }
-
-          expect(response.status                 ).to eql(200)
-          expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
-          result = JSON.parse(response.body)
-
-          expect(result['members'].map { |m| m['value'] }.sort()).to eql(expected_remaining_user_ids)
-          expect(@g1.reload().mock_users.map(&:primary_key).sort()).to eql(expected_remaining_user_ids)
-        end
-      end
-
-      # https://tools.ietf.org/html/rfc7644#section-3.5.2.2
-      #
-      context 'and using an RFC-compliant payload' do
-        let(:removed_user) { @u2 }
-        let(:payload) do
-          {
-            format: :scim,
-            Operations: [
-              {
-                op: 'remove',
-                path: "members[value eq \"#{removed_user().primary_key}\"]",
-              }
-            ]
-          }
-        end
-
-        it_behaves_like 'a user remover'
-      end # context 'and using an RFC-compliant payload' do
-
-      # https://learn.microsoft.com/en-us/azure/active-directory/app-provisioning/use-scim-to-provision-users-and-groups#update-group-remove-members
-      #
-      context 'and using a Microsoft variant payload' do
-        let(:removed_user) { @u2 }
-        let(:payload) do
-          {
-            format: :scim,
-            Operations: [
-              {
-                op: 'remove',
-                path: 'members',
-                value: [{
-                  '$ref' => nil,
-                  'value' => removed_user().primary_key
-                }]
-              }
-            ]
-          }
-        end
-
-        it_behaves_like 'a user remover'
-      end # context 'and using a Microsoft variant payload' do
-
-      # https://help.salesforce.com/s/articleView?id=sf.identity_scim_manage_groups.htm&type=5
-      #
-      context 'and using a Salesforce variant payload' do
-        let(:removed_user) { @u2 }
-        let(:payload) do
-          {
-            format: :scim,
-            Operations: [
-              {
-                op: 'remove',
-                path: 'members',
-                value: {
-                  'members' => [{
-                    '$ref' => nil,
-                    'value' => removed_user().primary_key
-                  }]
-                }
-              }
-            ]
-          }
-        end
-
-        it_behaves_like 'a user remover'
-      end # context 'and using a Salesforce variant payload' do
-    end # "context 'when removing users from groups' do"
   end # "context '#update' do"
 
   # ===========================================================================
@@ -925,7 +569,7 @@ RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
       expect_any_instance_of(MockUsersController).to receive(:destroy).once.and_call_original
       expect_any_instance_of(MockUser).to receive(:destroy!).once.and_call_original
       expect {
-        delete "/Users/#{@u2.primary_key}", params: { format: :scim }
+        delete "/Users/#{@u2.id}", params: { format: :scim }
       }.to change { MockUser.count }.by(-1)
 
       expect(response.status).to eql(204)
@@ -937,7 +581,7 @@ RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
       expect_any_instance_of(MockUser).to_not receive(:destroy!)
 
       expect {
-        delete "/CustomDestroyUsers/#{@u2.primary_key}", params: { format: :scim }
+        delete "/CustomDestroyUsers/#{@u2.id}", params: { format: :scim }
       }.to_not change { MockUser.count }
 
       expect(response.status).to eql(204)
@@ -952,11 +596,8 @@ RSpec.describe Scimitar::ActiveRecordBackedResourcesController do
         delete '/Users/xyz', params: { format: :scim }
       }.to_not change { MockUser.count }
 
-      expect(response.status                 ).to eql(404)
-      expect(response.headers['Content-Type']).to eql('application/scim+json; charset=utf-8')
-
+      expect(response.status).to eql(404)
       result = JSON.parse(response.body)
-
       expect(result['status']).to eql('404')
     end
   end # "context '#destroy' do"