paragraph
bolditalic"} + result = described_class.new(args: args).call + expect(result).to eq(key: "paragraph
bolditalic") + end + + context "when the value is an Array" do + it "strips malicious tags from every value of the array (only going 1 level deep)" do + args = {key: ["Some allowed text", "Link"]} + result = described_class.new(args: args).call + expect(result).to eq(key: ["alert('problem');Some allowed text", "Link"]) + end + + context "when the array contains non string values" do + it "doesn't raise an error" do + date = Date.current + args = {key: ["A string", date, 1]} + + result = described_class.new(args: args).call + + expect(result).to eq(key: ["A string", date, 1]) + end + end + end + + context "when the value is a hash of more args" do + it "strips malicious tags from every value in every hash" do + args = { + first_hash_key: { + second_hash_key: "2", + nested_hash: { + third_hash_key: "Link" + } + } + } + result = described_class.new(args: args).call + expect(result).to eq( + first_hash_key: { + second_hash_key: "alert('problem');2", + nested_hash: { + third_hash_key: "Link" + } + } + ) + end + end + + context "when the value is a Date" do + it "returns the date without raising an error" do + date = Date.current + args = {key: date} + + result = described_class.new(args: args).call + + expect(result).to eq(key: date) + end + end + end +end diff --git a/spec/support/contentful_helpers.rb b/spec/support/contentful_helpers.rb index b1edab7c0..2ee361d7e 100644 --- a/spec/support/contentful_helpers.rb +++ b/spec/support/contentful_helpers.rb @@ -4,7 +4,7 @@ def stub_contentful_entry( fixture_filename: "radio-question-example.json" ) contentful_connector = stub_contentful_connector - contentful_response = fake_contentful_step(contentful_fixture_filename: fixture_filename) + contentful_response = fake_contentful_step_or_task(contentful_fixture_filename: fixture_filename) allow(contentful_connector).to receive(:get_entry_by_id) .with(entry_id) .and_return(contentful_response) @@ -63,7 +63,7 @@ def stub_contentful_section_steps( sections.each do |section| fake_steps = section.steps.map { |step| - fake_step = fake_contentful_step(contentful_fixture_filename: "steps/#{step.id}.json") + fake_step = fake_contentful_step_or_task(contentful_fixture_filename: "steps/#{step.id}.json") expect(contentful_connector).to receive(:get_entry_by_id) .with(fake_step.id) .and_return(fake_step) @@ -83,13 +83,32 @@ def stub_contentful_category_steps( .and_return(contentful_connector) category.steps.each do |step| - step = fake_contentful_step(contentful_fixture_filename: "steps/#{step.id}.json") + step = fake_contentful_step_or_task(contentful_fixture_filename: "steps/#{step.id}.json") allow(contentful_connector).to receive(:get_entry_by_id) .with(step.id) .and_return(step) end end + def stub_contentful_section_tasks( + sections:, + contentful_connector: instance_double(ContentfulConnector) + ) + allow(ContentfulConnector).to receive(:new) + .and_return(contentful_connector) + + sections.each do |section| + fake_tasks = section.tasks.map { |task| + fake_task = fake_contentful_step_or_task(contentful_fixture_filename: "tasks/#{task.id}.json") + expect(contentful_connector).to receive(:get_entry_by_id) + .with(fake_task.id) + .and_return(fake_task) + fake_task + } + allow(section).to receive(:tasks).and_return(fake_tasks) + end + end + def stub_contentful_connector contentful_connector = instance_double(ContentfulConnector) expect(ContentfulConnector).to receive(:new) @@ -125,15 +144,19 @@ def fake_contentful_section(contentful_fixture_filename:) raw_response = File.read("#{Rails.root}/spec/fixtures/contentful/#{contentful_fixture_filename}") hash_response = JSON.parse(raw_response) + steps = hash_response.dig("fields", "steps") + tasks = hash_response.dig("fields", "tasks") + double( Contentful::Entry, id: hash_response.dig("sys", "id"), title: hash_response.dig("fields", "title"), - steps: hash_response.dig("fields", "steps").map { |step_hash| double(id: step_hash.dig("sys", "id")) } + steps: steps.nil? ? {} : steps.map { |step_hash| double(id: step_hash.dig("sys", "id")) }, + tasks: tasks.nil? ? {} : tasks.map { |task_hash| double(id: task_hash.dig("sys", "id")) } ) end - def fake_contentful_step(contentful_fixture_filename:) + def fake_contentful_step_or_task(contentful_fixture_filename:) raw_response = File.read("#{Rails.root}/spec/fixtures/contentful/#{contentful_fixture_filename}") hash_response = JSON.parse(raw_response) diff --git a/spec/support/sign_in_helpers.rb b/spec/support/sign_in_helpers.rb index 4f903547e..12c8049ac 100644 --- a/spec/support/sign_in_helpers.rb +++ b/spec/support/sign_in_helpers.rb @@ -14,7 +14,7 @@ def user_sign_in_attempt_fails(dsi_uid: SecureRandom.uuid) def user_starts_the_journey visit root_path - click_link I18n.t("generic.button.start") + click_button I18n.t("generic.button.start") click_link I18n.t("dashboard.create.link") end diff --git a/terraform/app/cdn.tf b/terraform/app/cdn.tf new file mode 100644 index 000000000..ca70b4dab --- /dev/null +++ b/terraform/app/cdn.tf @@ -0,0 +1,18 @@ +data "cloudfoundry_service" "cdn_route" { + name = "cdn-route" +} + +resource "cloudfoundry_service_instance" "cdn_route" { + count = local.environment == "prod" ? 1 : (local.environment == "staging" ? 1 : 0) + name = local.environment == "prod" ? "get-help-buying-for-schools" : "get-help-buying-for-schools-staging" + space = data.cloudfoundry_space.space.id + service_plan = data.cloudfoundry_service.cdn_route.service_plans["cdn-route"] + json_params = jsonencode( + { + domain = "${local.custom_hostname}.${local.custom_cloudfoundry_domain}" + } + ) + lifecycle { + prevent_destroy = true + } +}