Skip to content

Commit

Permalink
AP-2416: Revert 'family' to 'Family'
Browse files Browse the repository at this point in the history
Reverting as CategoryOfLawDescription is sent in the CCMS payload from Apply
  • Loading branch information
agoldstone93 committed Sep 5, 2024
1 parent 83f00f8 commit 9c8b7ae
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion app/services/ccms/attribute_value_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ def lead_proceeding_category_of_law(_options)
end

def lead_proceeding_category_of_law_is_family?(_options)
lead_proceeding.category_of_law == "family"
lead_proceeding.category_of_law == "Family"
end

def lead_proceeding_meaning(_options)
Expand Down
2 changes: 1 addition & 1 deletion app/views/providers/has_other_proceedings/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<%= summary_list.with_row(html_attributes: { id: "proceeding_type_#{proceeding.ccms_code}" }) do |row| %>
<%= row.with_value do %>
<%= proceeding.meaning %><br>
<span class="govuk-hint"><%= proceeding.matter_type.humanize %>, <%= proceeding.category_of_law %></span>
<span class="govuk-hint"><%= proceeding.matter_type.humanize %>, <%= proceeding.category_of_law.downcase %></span>
<% end %>
<% if proceeding.sca_type == "core" && @legal_aid_application.related_proceedings.any? %>
<%= row.with_action(
Expand Down
2 changes: 1 addition & 1 deletion app/views/providers/proceedings_types/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
:id,
proceeding_type.ccms_code,
label: { text: proceeding_type.meaning },
hint: { text: "#{proceeding_type.ccms_matter.humanize}, #{proceeding_type.ccms_category_law}" },
hint: { text: "#{proceeding_type.ccms_matter.humanize}, #{proceeding_type.ccms_category_law.downcase}" },
) %>
</div>
<% end %>
Expand Down
16 changes: 8 additions & 8 deletions features/support/puffing_billy_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ def proceeding_search_term_stubs
ccms_code: "DA004",
description: "to be represented on an application for a non-molestation order.",
full_s8_only: false,
ccms_category_law: "family",
ccms_category_law: "Family",
ccms_matter: "domestic abuse (DA)",
},
],
Expand All @@ -180,15 +180,15 @@ def proceeding_search_term_stubs
ccms_code: "DA001",
description: "to be represented on an application for an injunction, order or declaration under the inherent jurisdiction of the court.",
full_s8_only: false,
ccms_category_law: "family",
ccms_category_law: "Family",
ccms_matter: "domestic abuse (DA)",
},
{
meaning: "Harassment - injunction",
ccms_code: "DA003",
description: "to be represented in an action for an injunction under section 3 Protection from Harassment Act 1997.",
full_s8_only: false,
ccms_category_law: "family",
ccms_category_law: "Family",
ccms_matter: "domestic abuse (DA)",
},
],
Expand All @@ -202,7 +202,7 @@ def proceeding_search_term_stubs
ccms_code: "DA005",
description: "to be represented on an application for an occupation order.",
full_s8_only: false,
ccms_category_law: "family",
ccms_category_law: "Family",
ccms_matter: "domestic abuse (DA)",
},
],
Expand All @@ -216,7 +216,7 @@ def proceeding_search_term_stubs
ccms_code: "DA020",
description: "To be represented on an application for a Female Genital Mutilation Protection Order under the Female Genital Mutilation Act.",
full_s8_only: false,
ccms_category_law: "family",
ccms_category_law: "Family",
ccms_matter: "domestic abuse (DA)",
},
],
Expand All @@ -230,15 +230,15 @@ def proceeding_search_term_stubs
ccms_code: "DA003",
description: "to be represented in an action for an injunction under section 3 Protection from Harassment Act 1997.",
full_s8_only: false,
ccms_category_law: "family",
ccms_category_law: "Family",
ccms_matter: "domestic abuse (DA)",
},
{
meaning: "Non-molestation order",
ccms_code: "DA004",
description: "to be represented on an application for a non-molestation order.",
full_s8_only: false,
ccms_category_law: "family",
ccms_category_law: "Family",
ccms_matter: "domestic abuse (DA)",
},
],
Expand All @@ -252,7 +252,7 @@ def proceeding_search_term_stubs
ccms_code: "SE014",
description: "to be represented on an application for a child arrangements order - where the child(ren) will live",
full_s8_only: false,
ccms_category_law: "family",
ccms_category_law: "Family",
ccms_matter: "section 8 children (S8)",
},
],
Expand Down
26 changes: 13 additions & 13 deletions spec/factories/proceedings.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
used_delegated_functions_reported_on { nil }
name { "inherent_jurisdiction_high_court_injunction" }
matter_type { "Domestic Abuse" }
category_of_law { "family" }
category_of_law { "Family" }
category_law_code { "MAT" }
ccms_matter_code { "MINJN" }
client_involvement_type_ccms_code { "A" }
Expand All @@ -90,7 +90,7 @@
used_delegated_functions_reported_on { Time.zone.today }
name { "variation_or_discharge_under_section_protection_from_harassment_act" }
matter_type { "Domestic Abuse" }
category_of_law { "family" }
category_of_law { "Family" }
category_law_code { "MAT" }
ccms_matter_code { "MINJN" }
client_involvement_type_ccms_code { "A" }
Expand All @@ -114,7 +114,7 @@
used_delegated_functions_reported_on { Time.zone.today }
name { "occupation_order" }
matter_type { "Domestic Abuse" }
category_of_law { "family" }
category_of_law { "Family" }
category_law_code { "MAT" }
ccms_matter_code { "MINJN" }
client_involvement_type_ccms_code { "A" }
Expand All @@ -138,7 +138,7 @@
used_delegated_functions_reported_on { Time.zone.today }
name { "extend_variation_or_discharge_part_iv" }
matter_type { "Domestic Abuse" }
category_of_law { "family" }
category_of_law { "Family" }
category_law_code { "MAT" }
ccms_matter_code { "MINJN" }
client_involvement_type_ccms_code { "A" }
Expand All @@ -162,7 +162,7 @@
used_delegated_functions_reported_on { Time.zone.today }
name { "nonmolestation_order" }
matter_type { "Domestic Abuse" }
category_of_law { "family" }
category_of_law { "Family" }
category_law_code { "MAT" }
ccms_matter_code { "MINJN" }
client_involvement_type_ccms_code { "A" }
Expand All @@ -186,7 +186,7 @@
used_delegated_functions_reported_on { nil }
name { "prohibited_steps_order_s8" }
matter_type { "section 8 children (S8)" }
category_of_law { "family" }
category_of_law { "Family" }
category_law_code { "MAT" }
ccms_matter_code { "KSEC8" }
client_involvement_type_ccms_code { "A" }
Expand All @@ -210,7 +210,7 @@
used_delegated_functions_reported_on { nil }
name { "specified_issue_order_s8" }
matter_type { "Section 8 orders" }
category_of_law { "family" }
category_of_law { "Family" }
category_law_code { "MAT" }
ccms_matter_code { "KSEC8" }
client_involvement_type_ccms_code { "A" }
Expand All @@ -234,7 +234,7 @@
used_delegated_functions_reported_on { nil }
name { "child_arrangements_order_contact" }
matter_type { "Section 8 orders" }
category_of_law { "family" }
category_of_law { "Family" }
category_law_code { "MAT" }
ccms_matter_code { "KSEC8" }
client_involvement_type_ccms_code { "A" }
Expand All @@ -258,7 +258,7 @@
used_delegated_functions_reported_on { nil }
name { "child_arrangements_order_residence" }
matter_type { "Section 8 orders" }
category_of_law { "family" }
category_of_law { "Family" }
category_law_code { "MAT" }
ccms_matter_code { "KSEC8" }
client_involvement_type_ccms_code { "A" }
Expand Down Expand Up @@ -290,7 +290,7 @@
used_delegated_functions_reported_on { nil }
name { "CAO contact-Appeal" }
matter_type { "Section 8 orders" }
category_of_law { "family" }
category_of_law { "Family" }
category_law_code { "MAT" }
ccms_matter_code { "KSEC8" }
client_involvement_type_ccms_code { "A" }
Expand All @@ -309,7 +309,7 @@
used_delegated_functions_reported_on { nil }
name { "child_assessment_order_sca" }
matter_type { "special children act (SCA)" }
category_of_law { "family" }
category_of_law { "Family" }
category_law_code { "MAT" }
ccms_matter_code { "KPBLW" }
client_involvement_type_ccms_code { "A" }
Expand All @@ -332,7 +332,7 @@
used_delegated_functions_reported_on { nil }
name { "app_contact_child_in_care_sca" }
matter_type { "special children act (SCA)" }
category_of_law { "family" }
category_of_law { "Family" }
category_law_code { "MAT" }
ccms_matter_code { "KPBLW" }
client_involvement_type_ccms_code { "A" }
Expand All @@ -352,7 +352,7 @@
used_delegated_functions_reported_on { nil }
name { "app_for_supervision_order_sca" }
matter_type { "special children act (SCA)" }
category_of_law { "family" }
category_of_law { "Family" }
category_law_code { "MAT" }
ccms_matter_code { "KPBLW" }
client_involvement_type_ccms_code { "A" }
Expand Down
2 changes: 1 addition & 1 deletion spec/forms/proceedings/emergency_defaults_form_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
used_delegated_functions_reported_on: Time.zone.today,
name: "inherent_jurisdiction_high_court_injunction",
matter_type: "Domestic Abuse",
category_of_law: "family",
category_of_law: "Family",
category_law_code: "MAT",
ccms_matter_code: "MINJN",
client_involvement_type_ccms_code: "A",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -967,7 +967,7 @@ module Requestors

it "adds APP_IS_FAMILY attribute with value from application to merits assessment section" do
block = XmlExtractor.call(xml, :global_merits, "APP_IS_FAMILY")
expect(block).to have_boolean_response(proceeding.category_of_law == "family")
expect(block).to have_boolean_response(proceeding.category_of_law == "Family")
end

it "adds CAT_OF_LAW_DESCRIPTION attribute with value from application to merits assessment section" do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1359,7 +1359,7 @@ module Requestors

it "populates APP_IS_FAMILY" do
block = XmlExtractor.call(xml, :global_merits, "APP_IS_FAMILY")
expect(block).to have_boolean_response(proceeding.category_of_law == "family")
expect(block).to have_boolean_response(proceeding.category_of_law == "Family")
end

it "populates CAT_OF_LAW_DESCRIPTION" do
Expand Down
12 changes: 6 additions & 6 deletions spec/services/legal_framework/proceeding_types/all_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def all_proceeding_types_payload
full_s8_only: false,
sca_core: false,
sca_related: false,
ccms_category_law: "family",
ccms_category_law: "Family",
ccms_category_law_code: "MAT",
ccms_matter_code: "MINJN",
ccms_matter: "domestic abuse (DA)",
Expand All @@ -54,7 +54,7 @@ def all_proceeding_types_payload
full_s8_only: true,
sca_core: false,
sca_related: false,
ccms_category_law: "family",
ccms_category_law: "Family",
ccms_category_law_code: "MAT",
ccms_matter_code: "KSEC8",
ccms_matter: "section 8 children (S8)",
Expand All @@ -66,7 +66,7 @@ def all_proceeding_types_payload
full_s8_only: false,
sca_core: false,
sca_related: false,
ccms_category_law: "family",
ccms_category_law: "Family",
ccms_category_law_code: "MAT",
ccms_matter_code: "MINJN",
ccms_matter: "domestic abuse (DA)",
Expand All @@ -78,7 +78,7 @@ def all_proceeding_types_payload
full_s8_only: true,
sca_core: false,
sca_related: false,
ccms_category_law: "family",
ccms_category_law: "Family",
ccms_category_law_code: "MAT",
ccms_matter_code: "KSEC8",
ccms_matter: "section 8 children (S8)",
Expand All @@ -90,7 +90,7 @@ def all_proceeding_types_payload
full_s8_only: false,
sca_core: false,
sca_related: false,
ccms_category_law: "family",
ccms_category_law: "Family",
ccms_category_law_code: "MAT",
ccms_matter_code: "MINJN",
ccms_matter: "domestic abuse (DA)",
Expand All @@ -102,7 +102,7 @@ def all_proceeding_types_payload
full_s8_only: false,
sca_core: true,
sca_related: false,
ccms_category_law: "family",
ccms_category_law: "Family",
ccms_category_law_code: "MAT",
ccms_matter_code: "KPBLW",
ccms_matter: "special children act (SCA)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@

it "has the expected values in all attributes" do
response = call
expect(response.ccms_category_law).to eq "family"
expect(response.ccms_category_law).to eq "Family"
expect(response.ccms_category_law_code).to eq "MAT"
expect(response.ccms_matter).to eq "domestic abuse (DA)"
expect(response.ccms_matter).to eq "Domestic abuse"
expect(response.ccms_matter_code).to eq "MINJN"
expect(response.cost_limitations).to eq expected_cost_limitations
expect(response.default_scope_limitations).to eq expected_default_scope_limitations
Expand Down

0 comments on commit 9c8b7ae

Please sign in to comment.