Merge branch 'SD-224-jobcode' into 'master'

Resolve SD-224 "Jobcode"

Closes SD-224

See merge request lap/alma-user-load!46

Author: steve-sullivan

lib/alma/xml_writer.rb

@@ -42,6 +42,8 @@ def ensure_open!
     def prolog_and_opening_tag
       tag = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
       tag += "<!-- GIT_COMMIT:#{ENV['GIT_COMMIT']} -->\n"
+      tag += "<!-- DOCKER_TAG:#{ENV['DOCKER_TAG']} -->\n"
+      tag += "<!-- VERSION: 1.5.4 -->\n"
       tag += "<users>\n"
       tag
     end

spec/data/sis/expected_xml_3.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- GIT_COMMIT:LOCAL_TESTING -->
+<!-- DOCKER_TAG:DEV -->
+<!-- VERSION: 1.5.4 -->
 <users>
 <user>
   <record_type>PUBLIC</record_type>

spec/data/ucpath/expected_xml_1.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- GIT_COMMIT:LOCAL_TESTING -->
+<!-- DOCKER_TAG:DEV -->
+<!-- VERSION: 1.5.4 -->
 <users>
 <user>
   <record_type>PUBLIC</record_type>

spec/lib/alma_spec.rb

@@ -37,8 +37,8 @@
       Alma::XMLWriter.open(out) { |w| w.write(@student_rec) }
       actual = File.read(out)
       xml = Alma::XMLBuilder.new(@student_rec).build
-      expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!-- GIT_COMMIT:LOCAL_TESTING -->\n<users>\n#{xml}\n</users>"
-      expect(actual).to eq(expected)
+      expected = "<users>\n#{xml}\n</users>"
+      expect(actual).to include(expected)
     end
   end
 
@@ -51,9 +51,9 @@
       actual = File.read(out)
 
       xml = Alma::XMLBuilder.new(@student_rec).build
-      expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!-- GIT_COMMIT:LOCAL_TESTING -->\n<users>\n#{xml}\n</users>"
+      expected = "<users>\n#{xml}\n</users>"
 
-      expect(actual).to eq(expected)
+      expect(actual).to include(expected)
     end
   end
 end

spec/spec_helper.rb

@@ -39,6 +39,7 @@
   # Mock ENVs for testing
   config.before(:each) do
     ENV['GIT_COMMIT'] = 'LOCAL_TESTING'
+    ENV['DOCKER_TAG'] = 'DEV'
   end
 
   config.color = true