Update tests to reflect added fields

Author: dcollie2

spec/services/xml_generator/all_providers_spec.rb

@@ -19,36 +19,47 @@
   end
 
   it "generates the xml" do
-    expect(subject.perform).to eq(
-      <<~TEXT
-        <?xml version="1.0"?>
-        <cmes>
-          <content_provider name="#{provider1.name}">
-            <topic_year year="#{topic1.published_at.year}">
-              <topic_month month="#{topic1.published_at.strftime("%m_%B")}">
-                <title name="#{topic1.title}">
-                  <topic_id>#{topic1.id}</topic_id>
-                  <topic_files files="Files"/>
-                  <topic_tags>#{topic1.current_tags_list.join(", ")}</topic_tags>
-                </title>
-              </topic_month>
-            </topic_year>
-          </content_provider>
-          <content_provider name="#{provider2.name}">
-            <topic_year year="#{topic2.published_at.year}">
-              <topic_month month="#{topic2.published_at.strftime("%m_%B")}">
-                <title name="#{topic2.title}">
-                  <topic_id>#{topic2.id}</topic_id>
-                  <topic_files files="Files">
-                    <file_name_1 file_size="494323">test_image.png</file_name_1>
-                  </topic_files>
-                  <topic_tags>#{topic2.current_tags_list.join(", ")}</topic_tags>
-                </title>
-              </topic_month>
-            </topic_year>
-          </content_provider>
-        </cmes>
-      TEXT
-    )
+    xml = subject.perform
+    doc = Nokogiri::XML(xml)
+
+    [provider1, provider2].each do |prov|
+      pnode = doc.at_xpath("//cmes/content_provider[@name='#{prov.name}']")
+      expect(pnode).to be_present
+    end
+
+    [[provider1, topic1], [provider2, topic2]].each do |prov, topic|
+      pnode = doc.at_xpath("//cmes/content_provider[@name='#{prov.name}']")
+      year = topic.published_at.year
+      ynode = pnode.at_xpath("./topic_year[@year='#{year}']")
+      expect(ynode).to be_present
+
+      month_label = topic.published_at.strftime('%m_%B')
+      mnode = ynode.at_xpath("./topic_month[@month='#{month_label}']")
+      expect(mnode).to be_present
+
+      tnode = mnode.at_xpath("./title[@name='#{topic.title}']")
+      expect(tnode).to be_present
+
+      expect(tnode.at_xpath('./topic_id').text).to eq(topic.id.to_s)
+      expect(tnode.at_xpath('./counter').text).to eq('0')
+      expect(tnode.at_xpath('./topic_volume').text).to eq(topic.published_at.year.to_s)
+      expect(tnode.at_xpath('./topic_issue').text).to eq(topic.published_at.month.to_s)
+
+      files = tnode.at_xpath("./topic_files[@files='Files']")
+      expect(files).to be_present
+      if topic.documents.attached? && topic.documents.reject { |d| d.content_type == 'video/mp4' }.any?
+        first_file = files.element_children.first
+        expect(first_file).to be_present
+        expect(first_file.text).to be_present
+        expect(first_file['file_size']).to be_present
+      else
+        expect(files.element_children).to be_empty
+      end
+
+      author1 = tnode.at_xpath('./topic_author/topic_author_1')
+      expect(author1.text).to eq(' ')
+
+      expect(tnode.at_xpath('./topic_tags').text).to eq(topic.current_tags_list.join(', '))
+    end
   end
 end

spec/services/xml_generator/single_provider_spec.rb

@@ -6,14 +6,12 @@
   let(:provider) { create(:provider) }
 
   it "generates the xml" do
-    expect(subject.perform).to eq(
-      <<~TEXT
-        <?xml version="1.0"?>
-        <cmes>
-          <content_provider name="#{provider.name}"/>
-        </cmes>
-      TEXT
-    )
+  xml = subject.perform
+  doc = Nokogiri::XML(xml)
+  provider_nodes = doc.xpath("//cmes/content_provider[@name='#{provider.name}']")
+  expect(provider_nodes.size).to eq(1)
+  # No topics → self-closing provider node (no children)
+  expect(provider_nodes.first.element_children).to be_empty
   end
 
   context "with topics" do
@@ -35,26 +33,37 @@
     end
 
     it "generates the xml" do
-      expect(subject.perform).to eq(
-        <<~TEXT
-          <?xml version="1.0"?>
-          <cmes>
-            <content_provider name="#{provider.name}">
-              <topic_year year="#{topic.published_at.year}">
-                <topic_month month="#{topic.published_at.strftime("%m_%B")}">
-                  <title name="#{topic.title}">
-                    <topic_id>#{topic.id}</topic_id>
-                    <topic_files files="Files">
-                      <file_name_1 file_size="494323">test_image.png</file_name_1>
-                    </topic_files>
-                    <topic_tags>#{topic.current_tags_list.join(", ")}</topic_tags>
-                  </title>
-                </topic_month>
-              </topic_year>
-            </content_provider>
-          </cmes>
-        TEXT
-      )
+      xml = subject.perform
+      doc = Nokogiri::XML(xml)
+
+      provider_node = doc.at_xpath("//cmes/content_provider[@name='#{provider.name}']")
+      expect(provider_node).to be_present
+
+      year_node = provider_node.at_xpath("./topic_year[@year='#{topic.published_at.year}']")
+      expect(year_node).to be_present
+
+      month_label = topic.published_at.strftime("%m_%B")
+      month_node = year_node.at_xpath("./topic_month[@month='#{month_label}']")
+      expect(month_node).to be_present
+
+      title_node = month_node.at_xpath("./title[@name='#{topic.title}']")
+      expect(title_node).to be_present
+
+      expect(title_node.at_xpath('./topic_id').text).to eq(topic.id.to_s)
+      expect(title_node.at_xpath('./counter').text).to eq('0')
+      expect(title_node.at_xpath('./topic_volume').text).to eq(topic.published_at.year.to_s)
+      expect(title_node.at_xpath('./topic_issue').text).to eq(topic.published_at.month.to_s)
+
+      files_node = title_node.at_xpath("./topic_files[@files='Files']")
+      expect(files_node).to be_present
+      file1 = files_node.at_xpath('./file_name_1')
+      expect(file1.text).to eq('test_image.png')
+      expect(file1['file_size']).to be_present
+
+      author_node = title_node.at_xpath('./topic_author/topic_author_1')
+      expect(author_node.text).to eq(' ')
+
+      expect(title_node.at_xpath('./topic_tags').text).to eq(topic.current_tags_list.join(', '))
     end
   end
 end