Merge pull request #3212 from archivesspace/ANW-2025-fix-specs-add-ja…

…va-17 Fix specs for merged pull request #3194 from abbistani/ANW-2025
archivesspace · May 23, 2024 · aa6b6a9 · aa6b6a9
2 parents edb8660 + 7238680
commit aa6b6a9
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 17 deletions.
diff --git a/_yard/Gemfile.lock b/_yard/Gemfile.lock
@@ -8,6 +8,7 @@ GEM
 
 PLATFORMS
   universal-java-1.8
+  universal-java-17
 
 DEPENDENCIES
   kramdown

diff --git a/backend/Gemfile.lock b/backend/Gemfile.lock
@@ -217,6 +217,7 @@ GEM
 PLATFORMS
   universal-java-1.8
   universal-java-11
+  universal-java-17
 
 DEPENDENCIES
   actionmailer (~> 5.2)

diff --git a/backend/spec/export_dc_spec.rb b/backend/spec/export_dc_spec.rb
@@ -105,16 +105,16 @@
 
   it "has the correct namespaces" do
     expect(@dc).to have_namespaces({
-                                   "xmlns" => "https://purl.org/dc/elements/1.1/",
-                                   "xmlns:dcterms" => "https://purl.org/dc/terms/",
-                                   "xmlns:xlink" => "https://www.w3.org/1999/xlink",
-                                   "xmlns:xsi" => "https://www.w3.org/2001/XMLSchema-instance"
+                                   "xmlns" => "http://purl.org/dc/elements/1.1/",
+                                   "xmlns:dcterms" => "http://purl.org/dc/terms/",
+                                   "xmlns:xlink" => "http://www.w3.org/1999/xlink",
+                                   "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance"
                                  })
   end
 
 
   it "points to the right schemas" do
-    schema_locations = "https://purl.org/dc/elements/1.1/ https://dublincore.org/schemas/xmls/qdc/2006/01/06/dc.xsd https://purl.org/dc/terms/ https://dublincore.org/schemas/xmls/qdc/2006/01/06/dcterms.xsd".split(" ").sort.join(" ")
+    schema_locations = "http://purl.org/dc/elements/1.1/ https://dublincore.org/schemas/xmls/qdc/2006/01/06/dc.xsd http://purl.org/dc/terms/ https://dublincore.org/schemas/xmls/qdc/2006/01/06/dcterms.xsd".split(" ").sort.join(" ")
     expect(@dc.xpath("xmlns:dc", @dc.namespaces).attr("xsi:schemaLocation").value.split(" ").sort.join(" ")).to eq(schema_locations)
   end
 

diff --git a/backend/spec/export_eac_spec.rb b/backend/spec/export_eac_spec.rb
@@ -158,9 +158,9 @@
     it 'exports EAC with the correct namespaces' do
       expect(@eac).to have_namespaces({
                                         'xmlns' => 'urn:isbn:1-931666-33-4',
-                                        'xmlns:html' => 'https://www.w3.org/1999/xhtml',
-                                        'xmlns:xlink' => 'https://www.w3.org/1999/xlink',
-                                        'xmlns:xsi' => 'https://www.w3.org/2001/XMLSchema-instance'
+                                        'xmlns:html' => 'http://www.w3.org/1999/xhtml',
+                                        'xmlns:xlink' => 'http://www.w3.org/1999/xlink',
+                                        'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance'
                                       })
     end
 

diff --git a/backend/spec/export_marc_spec.rb b/backend/spec/export_marc_spec.rb
@@ -76,11 +76,11 @@ def source_to_code(source)
      end
 
      it "root node should have xmlns:xsi defined" do
-       expect(@xml).to match(/<collection.*xmlns:xsi="https:\/\/www.w3.org\/2001\/XMLSchema-instance"/)
+       expect(@xml).to match(/<collection.*xmlns:xsi="http:\/\/www.w3.org\/2001\/XMLSchema-instance"/)
      end
 
      it "root node should have xsi:schemaLocation defined" do
-       expect(@xml).to match(/<collection.*xsi:schemaLocation="https:\/\/www.loc.gov\/MARC21\/slim https:\/\/www.loc.gov\/standards\/marcxml\/schema\/MARC21slim.xsd"/)
+       expect(@xml).to match(/<collection.*xsi:schemaLocation="http:\/\/www.loc.gov\/MARC21\/slim https:\/\/www.loc.gov\/standards\/marcxml\/schema\/MARC21slim.xsd"/)
      end
    end
 

diff --git a/backend/spec/export_mets_spec.rb b/backend/spec/export_mets_spec.rb
@@ -68,17 +68,17 @@
 
   it "has the correct namespaces" do
     expect(@mets).to have_namespaces({
-                                   "xmlns" => "https://www.loc.gov/METS/",
-                                   "xmlns:mods"=> "https://www.loc.gov/mods/v3",
-                                   "xmlns:dc"=> "https://purl.org/dc/elements/1.1/",
-                                   "xmlns:xlink" => "https://www.w3.org/1999/xlink",
-                                   "xmlns:xsi" => "https://www.w3.org/2001/XMLSchema-instance"
+                                   "xmlns" => "http://www.loc.gov/METS/",
+                                   "xmlns:mods"=> "http://www.loc.gov/mods/v3",
+                                   "xmlns:dc"=> "http://purl.org/dc/elements/1.1/",
+                                   "xmlns:xlink" => "http://www.w3.org/1999/xlink",
+                                   "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance"
                                  })
   end
 
 
   it "has the correct schema location" do
-    expect(@mets).to have_schema_location "https://www.loc.gov/METS/ https://www.loc.gov/standards/mets/mets.xsd"
+    expect(@mets).to have_schema_location "http://www.loc.gov/METS/ https://www.loc.gov/standards/mets/mets.xsd"
   end
 
 

diff --git a/frontend/Gemfile.lock b/frontend/Gemfile.lock
@@ -355,6 +355,7 @@ GEM
 PLATFORMS
   universal-java-1.8
   universal-java-11
+  universal-java-17
 
 DEPENDENCIES
   activesupport

diff --git a/indexer/Gemfile.lock b/indexer/Gemfile.lock
@@ -36,8 +36,8 @@ GEM
       nokogiri (>= 1.5.11, < 2.0.0)
     formatador (0.3.0)
     hashdiff (1.0.1)
-      concurrent-ruby (~> 1.0)
     i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
     ipaddress (0.8.3)
     json (2.6.3-java)
     json-schema (1.0.10)
@@ -106,6 +106,7 @@ GEM
 PLATFORMS
   universal-java-1.8
   universal-java-11
+  universal-java-17
 
 DEPENDENCIES
   activesupport (< 6.0)

diff --git a/oai/Gemfile.lock b/oai/Gemfile.lock
@@ -17,6 +17,7 @@ GEM
 PLATFORMS
   universal-java-1.8
   universal-java-11
+  universal-java-17
 
 DEPENDENCIES
   sinatra (~> 2.2)

diff --git a/public/Gemfile.lock b/public/Gemfile.lock
@@ -335,6 +335,7 @@ GEM
 PLATFORMS
   universal-java-1.8
   universal-java-11
+  universal-java-17
 
 DEPENDENCIES
   atomic (= 1.0.1)