Remove reject button, all functionality, and update tests (#747)

## Status

-
[Closes](RaspberryPiFoundation/digital-editor-issues#1232)

## What's changed?

- Removed the reject button from the admin console, along with the tests
for it

Author: jamiebenstead

app/controllers/admin/schools_controller.rb

@@ -14,18 +14,6 @@ def verify
       redirect_to admin_school_path(requested_resource)
     end
 
-    def reject
-      service = SchoolVerificationService.new(requested_resource)
-
-      if service.reject
-        flash[:notice] = t('administrate.controller.reject_school.success')
-      else
-        flash[:error] = t('administrate.controller.reject_school.error')
-      end
-
-      redirect_to admin_school_path(requested_resource)
-    end
-
     def reopen
       service = SchoolVerificationService.new(requested_resource)
 

app/models/school.rb

@@ -96,10 +96,6 @@ def generate_code!
     end
   end
 
-  def reject
-    update(rejected_at: Time.zone.now)
-  end
-
   def reopen
     return false unless rejected?
 

app/services/school_verification_service.rb

@@ -17,6 +17,5 @@ def verify
     true
   end
 
-  delegate :reject, to: :school
   delegate :reopen, to: :school
 end

app/views/admin/schools/show.html.erb

@@ -45,15 +45,6 @@ as well as a link to its edit page.
       style: "background-color: darkorange; margin: 5px;",
       data: { confirm: t("administrate.actions.confirm_reopen_school") }
     ) unless page.resource.verified? || !page.resource.rejected? %>
-
-    <%= link_to(
-      t("administrate.actions.reject_school"),
-      reject_admin_school_path(page.resource),
-      class: "button button--danger",
-      method: :patch,
-      style: "background-color: hsla(0, 88%, 33%, 1); margin: 5px 5px 5px 0;",
-      data: { confirm: t("administrate.actions.confirm_reject_school") }
-    ) unless page.resource.verified? || page.resource.rejected? %>
   </div>
 </header>
 

config/locales/admin/en.yml

@@ -6,17 +6,12 @@ en:
       confirm_discard: Are you sure you want to discard this record?
       verify_school: Verify School
       confirm_verify_school: Are you sure you want to verify this school?
-      reject_school: Reject School
-      confirm_reject_school: Are you sure you want to reject this school?
       reopen_school: Reopen School
       confirm_reopen_school: Are you sure you want to reopen this school?
     controller:
       verify_school:
         success: "Successfully verified."
         error: "There was an error verifying the school"
-      reject_school:
-        success: "Successfully rejected."
-        error: "There was an error rejecting the school"
       reopen_school:
         success: "Successfully reopened."
         error: "There was an error reopening the school"

config/routes.rb

@@ -15,7 +15,6 @@
     resources :schools, only: %i[index show edit update] do
       member do
         post :verify
-        patch :reject
         patch :reopen
       end
     end

spec/features/admin/schools_spec.rb

@@ -36,10 +36,6 @@
       expect(response.body).to include(I18n.t('administrate.actions.verify_school'))
     end
 
-    it 'includes link to reject school' do
-      expect(response.body).to include(I18n.t('administrate.actions.reject_school'))
-    end
-
     it 'does not include a link to search for this school by its ZIP code in the NCES public schools database' do
       expect(response.body).not_to include('Search for this school in the NCES database')
     end
@@ -52,10 +48,6 @@
         expect(response.body).not_to include(I18n.t('administrate.actions.verify_school'))
       end
 
-      it 'does not include a link to reject school' do
-        expect(response.body).not_to include(I18n.t('administrate.actions.reject_school'))
-      end
-
       it 'does not include a link to reopen school' do
         expect(response.body).not_to include(I18n.t('administrate.actions.reopen_school'))
       end
@@ -68,10 +60,6 @@
         expect(response.body).not_to include(I18n.t('administrate.actions.verify_school'))
       end
 
-      it 'does not include a link to reject school' do
-        expect(response.body).not_to include(I18n.t('administrate.actions.reject_school'))
-      end
-
       it 'includes link to reopen school' do
         expect(response.body).to include(I18n.t('administrate.actions.reopen_school'))
       end
@@ -132,48 +120,6 @@
     end
   end
 
-  describe 'PUT #reject' do
-    let(:creator) { create(:user) }
-    let(:school) { create(:school, creator_id: creator.id) }
-    let(:rejection_result) { nil }
-    let(:verification_service) { instance_double(SchoolVerificationService, reject: rejection_result) }
-
-    before do
-      stub_user_info_api_for(creator)
-      allow(SchoolVerificationService).to receive(:new).with(school).and_return(verification_service)
-
-      patch reject_admin_school_path(school)
-    end
-
-    it 'redirects to school path' do
-      expect(response).to redirect_to(admin_school_path(school))
-    end
-
-    describe 'when rejection was successful' do
-      let(:rejection_result) { true }
-
-      before do
-        follow_redirect!
-      end
-
-      it 'displays success message' do
-        expect(response.body).to include(I18n.t('administrate.controller.reject_school.success'))
-      end
-    end
-
-    describe 'when rejection was unsuccessful' do
-      let(:rejection_result) { false }
-
-      before do
-        follow_redirect!
-      end
-
-      it 'displays failure message' do
-        expect(response.body).to include(I18n.t('administrate.controller.reject_school.error'))
-      end
-    end
-  end
-
   describe 'PUT #reopen' do
     let(:creator) { create(:user) }
     let(:school) { create(:verified_school, creator_id: creator.id) }

spec/models/school_spec.rb

@@ -192,9 +192,7 @@
     end
 
     it 'allows reference reuse when original school is rejected' do
-      school.reference = '100000'
-      school.save!
-      school.reject
+      school.update!(reference: '100000', rejected_at: Time.zone.now)
 
       new_school = build(:school, reference: '100000')
       expect(new_school).to be_valid
@@ -259,8 +257,7 @@
     end
 
     it 'allows district_nces_id reuse when original school is rejected' do
-      us_school.district_nces_id = '0100000'
-      us_school.reject
+      us_school.update!(rejected_at: Time.zone.now)
 
       new_school = build(:school, country_code: 'US', district_name: 'Some District', district_nces_id: '0100000')
       expect(new_school).to be_valid
@@ -331,7 +328,7 @@
     end
 
     it 'allows school_roll_number reuse when original school is rejected' do
-      ireland_school.reject
+      ireland_school.update!(rejected_at: Time.zone.now)
 
       new_school = build(:school, school_roll_number: '01572D', country_code: 'IE')
       expect(new_school).to be_valid
@@ -400,12 +397,12 @@
 
     it 'cannot have #rejected_at set when #verified_at is present' do
       school.verify!
-      school.reject
+      school.update(rejected_at: Time.zone.now)
       expect(school.errors[:rejected_at]).to include('must be blank')
     end
 
     it 'cannot have #verified_at set when #rejected_at is present' do
-      school.reject
+      school.rejected_at = Time.zone.now
       school.update(verified_at: Time.zone.now)
       expect(school.errors[:verified_at]).to include('must be blank')
     end
@@ -487,7 +484,7 @@
     it('raises ActiveRecord::RecordNotFound if the user is the creator of a rejected school') do
       creator = create(:user)
       school.update!(creator_id: creator.id)
-      school.reject
+      school.update!(rejected_at: Time.zone.now)
 
       expect { described_class.find_for_user!(creator) }.to raise_error(ActiveRecord::RecordNotFound)
     end
@@ -617,17 +614,6 @@
     end
   end
 
-  describe '#reject' do
-    it 'sets rejected_at to the current time' do
-      school.reject
-      expect(school.rejected_at).to be_within(1.second).of(Time.zone.now)
-    end
-
-    it 'returns true on successful rejection' do
-      expect(school.reject).to be(true)
-    end
-  end
-
   describe 'salesforce sync' do
     around do |example|
       ClimateControl.modify(SALESFORCE_ENABLED: 'true') { example.run }
@@ -668,13 +654,13 @@
 
   describe '#reopen' do
     it 'sets rejected_at to nil' do
-      school.reject
+      school.rejected_at = Time.zone.now
       school.reopen
       expect(school.rejected_at).to be_nil
     end
 
     it 'returns true on successful reopening' do
-      school.reject
+      school.rejected_at = Time.zone.now
       expect(school.reopen).to be(true)
     end
 

spec/services/school_verification_service_spec.rb

@@ -43,25 +43,9 @@
     end
   end
 
-  describe '#reject' do
-    before do
-      service.reject
-      school.reload
-    end
-
-    it 'sets verified_at to nil' do
-      expect(school.verified_at).to be_nil
-    end
-
-    it 'sets rejected_at to a date' do
-      expect(school.rejected_at).to be_a(ActiveSupport::TimeWithZone)
-    end
-  end
-
   describe 'when the school was previously verified' do
     before do
       service.verify
-      service.reject
       school.reload
     end