Merge pull request #1706 from DFE-Digital/fix/correct-project-policy

Fix project policy

CHANGELOG.md

@@ -28,6 +28,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   minister name and date of decision.
 - Revoking DAO ends a project
 
+### Fixed
+
+- The change conversion date and change transfer date buttons only appear on the
+  appropriate project type.
+
 ## [Release-76][release-76]
 
 ### Added

app/policies/project_policy.rb

@@ -66,10 +66,14 @@ def change_significant_date?
   end
 
   def change_conversion_date?
+    return false unless @project.is_a?(Conversion::Project)
+
     change_significant_date?
   end
 
   def change_transfer_date?
+    return false unless @project.is_a?(Transfer::Project)
+
     change_significant_date?
   end
 

spec/policies/project_policy_spec.rb

@@ -68,41 +68,32 @@
     end
   end
 
-  permissions :change_conversion_date?, :change_transfer_date? do
-    context "when the conversion date is not provisional" do
-      it "grants access if project is assigned to the same user" do
-        expect(subject).to permit(application_user, build(:conversion_project, assigned_to: application_user, conversion_date_provisional: false))
-      end
-
-      it "grants access if the user is service support" do
-        expect(subject).to permit(build(:user, :service_support), build(:conversion_project, assigned_to: application_user, conversion_date_provisional: false))
-      end
-
-      it "grants access if the project is complete and the user is service support" do
-        expect(subject).to permit(build(:user, :service_support), build(:conversion_project, completed_at: Date.yesterday, assigned_to: application_user, conversion_date_provisional: false))
-      end
-
-      it "denies access if the project is assigned to another user" do
-        expect(subject).not_to permit(application_user, build(:conversion_project, assigned_to: build(:user), conversion_date_provisional: false))
-      end
+  permissions :change_significant_date? do
+    it "grants access when the significant date is not provisional" do
+      expect(subject).to permit(application_user, build(:conversion_project, assigned_to: application_user, conversion_date_provisional: false))
+    end
+    it "denies access when the significant date is provisional" do
+      expect(subject).not_to permit(application_user, build(:conversion_project, assigned_to: application_user, conversion_date_provisional: true))
+    end
+  end
 
-      it "denies access if project is assigned to nil" do
-        expect(subject).not_to permit(application_user, build(:conversion_project, assigned_to: nil, conversion_date_provisional: false))
-      end
+  permissions :change_conversion_date? do
+    it "grants access when the project is a conversion" do
+      expect(subject).to permit(application_user, build(:conversion_project, assigned_to: application_user, conversion_date_provisional: false))
     end
 
-    context "when the conversion date is provisional" do
-      it "denies access if project is assigned to the same user" do
-        expect(subject).not_to permit(application_user, build(:conversion_project, assigned_to: application_user, conversion_date_provisional: true))
-      end
+    it "denies access when the project is a transfer" do
+      expect(subject).not_to permit(application_user, build(:transfer_project, assigned_to: application_user, transfer_date_provisional: false))
+    end
+  end
 
-      it "denies access if the project is assigned to another user" do
-        expect(subject).not_to permit(application_user, build(:conversion_project, assigned_to: build(:user), conversion_date_provisional: true))
-      end
+  permissions :change_transfer_date? do
+    it "grants access when the project is a transfer" do
+      expect(subject).to permit(application_user, build(:transfer_project, assigned_to: application_user, transfer_date_provisional: false))
+    end
 
-      it "denies access if project is assigned to nil" do
-        expect(subject).not_to permit(application_user, build(:conversion_project, assigned_to: nil, conversion_date_provisional: true))
-      end
+    it "denies access when the project is a conversion" do
+      expect(subject).not_to permit(application_user, build(:conversion_project, assigned_to: application_user, conversion_date_provisional: false))
     end
   end