Sort out issues after rebasing

Author: msquance-stem

app/jobs/send_cms_emails_job.rb

@@ -4,9 +4,8 @@ def perform
     page = 1
     loop do
       email_templates = Cms::Collections::EmailTemplate.all(page, PER_PAGE)
-      break if email_templates.resources.empty?
-
       email_templates.resources.each { process_template(_1) }
+      break if (page * PER_PAGE) > email_templates.total_records
       page += 1
     end
   end

app/services/cms/collections/email_template.rb

@@ -3,10 +3,9 @@ module Collections
     class EmailTemplate < Resource
       def self.is_collection = true
 
-      def self.collection_attribute_mapping
+      def self.collection_attribute_mappings
         [
           {model: Cms::Models::EmailTemplate, key: nil, param_name: :template},
-          {model: Cms::Models::Slug, key: nil, param_name: :slug}
         ]
       end
 

spec/components/cms/rich_text_block_component_spec.rb

@@ -31,7 +31,7 @@
       ]
     ]))
 
-    expect(page).to have_text("Hello world!")
+    expect(page).to have_css("p", text: "Hello world!")
   end
 
   it "renders a large heading" do
@@ -43,7 +43,31 @@
       ]
     ]))
 
-    expect(page).to have_text("Heading world!")
+    expect(page).to have_css(".govuk-heading-l", text: "Heading world!")
+  end
+
+  it "renders a medium heading" do
+    render_inline(described_class.new(blocks: [
+      type: "heading",
+      level: 2,
+      children: [
+        {type: "text", text: "Heading world!"}
+      ]
+    ]))
+
+    expect(page).to have_css(".govuk-heading-m", text: "Heading world!")
+  end
+
+  it "renders a small heading" do
+    render_inline(described_class.new(blocks: [
+      type: "heading",
+      level: 3,
+      children: [
+        {type: "text", text: "Heading world!"}
+      ]
+    ]))
+
+    expect(page).to have_css(".govuk-heading-s", text: "Heading world!")
   end
 
   it "renders some text" do
@@ -54,6 +78,46 @@
     expect(page).to have_text("Just text")
   end
 
+  it "renders bold text" do
+    render_inline(described_class.new(blocks: [
+      {type: "text", text: "Bold text", bold: true}
+    ]))
+
+    expect(page).to have_css(".cms-rich-text-block-component__text--bold", text: "Bold text")
+  end
+
+  it "renders italic text" do
+    render_inline(described_class.new(blocks: [
+      {type: "text", text: "Italic text", italic: true}
+    ]))
+
+    expect(page).to have_css(".cms-rich-text-block-component__text--italic", text: "Italic text")
+  end
+
+  it "renders underlined text" do
+    render_inline(described_class.new(blocks: [
+      {type: "text", text: "Underlined text", underline: true}
+    ]))
+
+    expect(page).to have_css(".cms-rich-text-block-component__text--underline", text: "Underlined text")
+  end
+
+  it "renders strikethrough text" do
+    render_inline(described_class.new(blocks: [
+      {type: "text", text: "Strikethrough text", strikethrough: true}
+    ]))
+
+    expect(page).to have_css(".cms-rich-text-block-component__text--strikethrough", text: "Strikethrough text")
+  end
+
+  it "renders code text" do
+    render_inline(described_class.new(blocks: [
+      {type: "text", text: "Code text", code: true}
+    ]))
+
+    expect(page).to have_css(".cms-rich-text-block-component__text--code", text: "Code text")
+  end
+
   it "renders a link" do
     render_inline(described_class.new(blocks: [
       {
@@ -65,7 +129,7 @@
       }
     ]))
 
-    expect(page).to have_text("A link to google (https://www.google.com)")
+    expect(page).to have_link("A link to google", href: "https://www.google.com")
   end
 
   it "renders an ordered list" do
@@ -80,8 +144,10 @@
       }
     ]))
 
-    expect(page).to have_text("1. Item 1")
-    expect(page).to have_text("2. Item 2")
+    expect(page).to have_css("ol.govuk-list--number")
+    expect(page).to have_css("ol", count: 1)
+    expect(page).to have_css("ol li", text: "Item 1")
+    expect(page).to have_css("ol li", text: "Item 2")
   end
 
   it "renders an unordered list" do
@@ -96,7 +162,49 @@
       }
     ]))
 
-    expect(page).to have_text("* Item 1")
-    expect(page).to have_text("* Item 2")
+    expect(page).to have_css("ul", count: 1)
+    expect(page).to have_css("ul li", text: "Item 1")
+    expect(page).to have_css("ul li", text: "Item 2")
+  end
+
+  it "renders an image" do
+    formats = {
+      medium: {url: "/an-image-medium.png"},
+      large: {url: "/an-image-large.png"}
+    }
+    render_inline(described_class.new(blocks: [
+      {
+        type: "image",
+        image: Cms::Models::Image.new(url: "/an-image.png", alt: "", caption: "", formats: formats, default_size: :medium)
+      }
+    ]))
+
+    expect(page).to have_css("img[src='/an-image-medium.png']")
+  end
+
+  it "renders a quote" do
+    render_inline(described_class.new(blocks: [
+      {
+        type: "quote",
+        children: [
+          {type: "text", text: "Quoted"}
+        ]
+      }
+    ]))
+
+    expect(page).to have_css("blockquote", text: "Quoted")
+  end
+
+  it "renders a hr when given three consecutive hyphens" do
+    render_inline(described_class.new(blocks: [
+      {
+        type: "paragraph",
+        children: [
+          {type: "text", text: "---"}
+        ]
+      }
+    ]))
+
+    expect(page).to have_css("hr")
   end
 end

spec/components/cms/rich_text_block_text_component_spec.rb

@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe Cms::RichTextBlockTextComponent, type: :component do
+RSpec.describe CmsRichTextBlockTextComponent, type: :component do
   it "renders a paragraph" do
     render_inline(described_class.new(blocks: [
       type: "paragraph",

spec/components/cms_email_course_list_component_spec.rb

@@ -15,7 +15,7 @@
   before do
     stub_strapi_email_template(email_template_1_slug, email_template: email_template_1)
     stub_strapi_email_template(email_template_2_slug, email_template: email_template_2)
-    stub_strapi_email_templates(email_templates: [email_template_1, email_template_2])
+    stub_strapi_email_templates(email_templates: [email_template_1, email_template_2], page: 1, page_size: 50)
 
     allow_any_instance_of(Programmes::ProgressQuery).to receive(:call).and_return(users)
   end

spec/components/cms_rich_text_block_text_component_spec.rb

@@ -162,20 +162,28 @@ def stub_strapi_web_page_not_found(key)
     end
   end
 
-  def stub_strapi_email_template(key, email_template: Cms::Mocks::EmailTemplate.generate_raw_data)
+  def stub_strapi_email_templates(email_templates: Array.new(4) { Cms::Mocks::EmailTemplate.generate_raw_data }, page: 1, page_size: 10)
     if as_graphql
-      stub_strapi_graphql_query("emailTemplates", email_template, unique_key: key)
+      stub_strapi_graphql_collection_query("emailTemplates", email_templates)
     else
-      stub_request(:get, /^https:\/\/strapi.teachcomputing.org\/api\/email-templates\/#{key}/).to_return_json(body: {data: email_template})
+      stub_request(:get, /^https:\/\/strapi.teachcomputing.org\/api\/email-templates/).to_return_json(body: to_strapi_collection(email_templates, page:, page_size:))
     end
   end
 
   def stub_strapi_email_template(key, email_template: Cms::Mocks::EmailTemplate.generate_raw_data)
-    stub_request(:get, /^https:\/\/strapi.teachcomputing.org\/api\/email-templates\/#{key}/).to_return_json(body: {data: email_template})
+    if as_graphql
+      stub_strapi_graphql_query("emailTemplates", email_template, unique_key: key)
+    else
+      stub_request(:get, /^https:\/\/strapi.teachcomputing.org\/api\/email-templates\/#{key}/).to_return_json(body: {data: email_template})
+    end
   end
 
   def stub_strapi_email_template_missing(key)
-    stub_request(:get, /^https:\/\/strapi.teachcomputing.org\/api\/email-templates\/#{key}/).to_return_json(body: not_found_response, status: 404)
+    if as_graphql
+      stub_strapi_graphql_query_missing("emailTemplates")
+    else
+      stub_request(:get, /^https:\/\/strapi.teachcomputing.org\/api\/email-templates\/#{key}/).to_return_json(body: not_found_response, status: 404)
+    end
   end
 
   def stub_strapi_programme(key, programme: Cms::Mocks::Programme.generate_raw_data)