diff --git a/app/views/admin/tasks/visa.html.erb b/app/views/admin/tasks/visa.html.erb
index 3110ab6a7d..1022fd2937 100644
--- a/app/views/admin/tasks/visa.html.erb
+++ b/app/views/admin/tasks/visa.html.erb
@@ -3,7 +3,7 @@
<%= render "shared/error_summary", instance: @task, errored_field_id_overrides: { "passed": "task_passed_true" } if @task.errors.any? %>
- <%= render "claim_summary", claim: @claim, heading: "Visa check" %>
+ <%= render @claim_summary_view, claim: @claim, heading: "Visa check" %>
<%= @current_task_name.humanize %>
diff --git a/spec/features/admin/admin_view_claim_spec.rb b/spec/features/admin/admin_view_claim_spec.rb
index 6a64e3f860..122926cdd5 100644
--- a/spec/features/admin/admin_view_claim_spec.rb
+++ b/spec/features/admin/admin_view_claim_spec.rb
@@ -2,4 +2,5 @@
RSpec.feature "Admin view claim" do
Policies.all.each { |policy| it_behaves_like "Admin View Claim Feature", policy }
+ Policies.all.excluding(Policies::FurtherEducationPayments).each { |policy| it_behaves_like "Admin View Claim logged in with tid", policy }
end
diff --git a/spec/support/admin_view_claim_feature_shared_examples.rb b/spec/support/admin_view_claim_feature_shared_examples.rb
index 56d2218154..4f720f5aa9 100644
--- a/spec/support/admin_view_claim_feature_shared_examples.rb
+++ b/spec/support/admin_view_claim_feature_shared_examples.rb
@@ -12,17 +12,6 @@
)
}
- let!(:claim_logged_in_with_tid) {
- eligibility = create(:"#{policy.to_s.underscore}_eligibility", :eligible)
- create(
- :claim,
- :submitted,
- :logged_in_with_tid,
- policy: policy,
- eligibility: eligibility
- )
- }
-
let!(:multiple_claim) {
eligibility = create(:"#{policy.to_s.underscore}_eligibility", :eligible)
create(
@@ -104,7 +93,6 @@
expect(page).to have_content("– Approved")
expect(page).to have_content("Approved awaiting payroll")
- expect(page).to have_content("Not signed in with DfE Identity")
end
end
@@ -159,17 +147,6 @@
end
end
- scenario "#{policy} view claim logged in with tid" do
- travel_to(@within_academic_year) do
- visit admin_claims_path
-
- find("a[href='#{admin_claim_tasks_path(claim_logged_in_with_tid)}']").click
-
- expect(page).to have_content("Claim route")
- expect(page).to have_content("Signed in with DfE Identity")
- end
- end
-
def expect_page_to_have_policy_sections(policy)
sections = case policy
when Policies::StudentLoans
diff --git a/spec/support/admin_view_claim_logged_in_with_tid_feature_shared_examples.rb b/spec/support/admin_view_claim_logged_in_with_tid_feature_shared_examples.rb
new file mode 100644
index 0000000000..17366bb176
--- /dev/null
+++ b/spec/support/admin_view_claim_logged_in_with_tid_feature_shared_examples.rb
@@ -0,0 +1,72 @@
+RSpec.shared_examples "Admin View Claim logged in with tid" do |policy|
+ let!(:journey_configuration) { create(:journey_configuration, policy.to_s.underscore) }
+ let(:academic_year) { journey_configuration.current_academic_year }
+
+ let!(:claim_logged_in_with_tid) {
+ eligibility = create(:"#{policy.to_s.underscore}_eligibility", :eligible)
+ create(
+ :claim,
+ :submitted,
+ :logged_in_with_tid,
+ policy: policy,
+ eligibility: eligibility
+ )
+ }
+
+ let!(:approved_paid_claim) {
+ eligibility = create(:"#{policy.to_s.underscore}_eligibility", :eligible)
+ create(
+ :claim,
+ :approved,
+ policy: policy,
+ eligibility: eligibility
+ )
+ }
+ let!(:approved_awaiting_payroll_claim) {
+ eligibility = create(:"#{policy.to_s.underscore}_eligibility", :eligible)
+ create(
+ :claim,
+ :payrollable,
+ policy: policy,
+ eligibility: eligibility
+ )
+ }
+ before do
+ @signed_in_user = sign_in_as_service_operator
+
+ PayrollRun.create_with_claims!([approved_paid_claim], [], created_by: @signed_in_user)
+
+ # NOTE: mirror claims factory for academic_year attribute "hardcoding" of 2019
+ current_academic_year =
+ if [Policies::EarlyCareerPayments, Policies::LevellingUpPremiumPayments].include?(policy)
+ academic_year
+ else
+ AcademicYear.new(2019)
+ end
+ @within_academic_year = Time.zone.local(current_academic_year.start_year, 9, 1)
+ end
+
+ scenario "#{policy} view claim logged in with tid" do
+ travel_to(@within_academic_year) do
+ visit admin_claims_path
+
+ find("a[href='#{admin_claim_tasks_path(claim_logged_in_with_tid)}']").click
+
+ expect(page).to have_content("Claim route")
+ expect(page).to have_content("Signed in with DfE Identity")
+ end
+ end
+
+ scenario "#{policy} filter approved awaiting payroll claims" do
+ travel_to(@within_academic_year) do
+ visit admin_claims_path
+
+ select "Approved awaiting payroll", from: "Status"
+ click_on "Apply filters"
+
+ find("a[href='#{admin_claim_tasks_path(approved_awaiting_payroll_claim)}']").click
+
+ expect(page).to have_content("Not signed in with DfE Identity")
+ end
+ end
+end