fix tests

service/lib/agama/autoyast/scripts_reader.rb

@@ -44,7 +44,7 @@ class ScriptsReader
       # @param profile [ProfileHash] AutoYaST profile
       def initialize(profile)
         @profile = profile
-        @anonymous_counter=0
+        @anonymous_counter = 0
       end
 
       # Returns a hash that corresponds to Agama "scripts" section.
@@ -101,7 +101,7 @@ def read_init_scripts
       # @param section [Hash] AutoYaST script section
       def read_script(section)
         script = {
-          "name" => section["filename"] || "annonymous#{@anonymous_counter+=1}"
+          "name" => section["filename"] || "annonymous#{@anonymous_counter += 1}"
         }
 
         if section["location"] && !section["location"].empty?

service/test/agama/autoyast/converter_test.rb

@@ -110,7 +110,7 @@
 
       it "evaluates the ERB code" do
         subject.to_agama(workdir)
-        expect(result["l10n"]).to include(
+        expect(result["localization"]).to include(
           "languages" => ["en_US.UTF-8", "es_ES.UTF-8"]
         )
       end
@@ -158,9 +158,9 @@
       end
     end
 
-    it "exports l10n settings" do
+    it "exports localization settings" do
       subject.to_agama(workdir)
-      expect(result["l10n"]).to include(
+      expect(result["localization"]).to include(
         "languages" => ["en_US.UTF-8"],
         "timezone"  => "Atlantic/Canary",
         "keyboard"  => "us"
@@ -197,7 +197,9 @@
       )
 
       # filter out deprecation warning as check-jsonschema is not packaged for TW yet
-      result = `jsonschema -i '#{result_path}' '#{schema}' 2>&1 | grep -v 'DeprecationWarning'`
+      result = `jsonschema -i '#{result_path}' '#{schema}' 2>&1 | \
+        grep -v 'DeprecationWarning' | \
+        grep -v 'from jsonschema.cli import main'`
       expect(result).to eq ""
     end
   end

service/test/agama/autoyast/l10n_reader_test.rb

@@ -30,6 +30,8 @@
     {}
   end
 
+  let(:l10n) { subject.read["localization"] }
+
   subject do
     described_class.new(Yast::ProfileHash.new(profile))
   end
@@ -49,7 +51,6 @@
       end
 
       it "includes a 'keyboard' key with its value" do
-        l10n = subject.read["l10n"]
         expect(l10n["keyboard"]).to eq("us")
       end
     end
@@ -65,7 +66,6 @@
       end
 
       it "includes a 'languages' key with all the languages" do
-        l10n = subject.read["l10n"]
         expect(l10n["languages"]).to eq(["en_US.UTF-8", "es_ES.UTF-8", "cs_CZ.UTF-8"])
       end
 
@@ -80,7 +80,6 @@
         end
 
         it "uses the UTF-8 encoding" do
-          l10n = subject.read["l10n"]
           expect(l10n["languages"]).to eq(["en_US.UTF-8", "es_ES.UTF-8"])
         end
       end
@@ -92,7 +91,6 @@
       end
 
       it "includes a 'keyboard' key with its value" do
-        l10n = subject.read["l10n"]
         expect(l10n["timezone"]).to eq("Europe/Berlin")
       end
     end