Adapt to the latest licenses API changes

src/lib/registration/ui/addon_eula_dialog.rb

@@ -3,7 +3,7 @@
 require "registration/eula_downloader"
 require "registration/eula_reader"
 require "registration/helpers"
-require "y2packager/license_store"
+require "y2packager/product_license"
 
 module Registration
   module UI
@@ -128,8 +128,8 @@ def accept_eula(addon)
         Dir.mktmpdir("extension-eula-") do |tmpdir|
           return :back unless download_eula(addon, tmpdir)
           eula_reader = EulaReader.new(tmpdir)
-          license = license(addon, eula_reader)
-          return :accepted if license.accepted?
+          license = find_license(addon, eula_reader)
+          return :accepted if license && license.accepted?
 
           setup_eula_dialog(addon, eula_reader, tmpdir)
           ret = run_eula_dialog(eula_reader)
@@ -146,17 +146,13 @@ def display_optional_info(info_file)
         Yast::InstShowInfo.show_info_txt(info_file) if File.exist?(info_file)
       end
 
-      def license_already_accepted?(addon, eula_reader)
-        license(addon, eula_reader).accepted?
-      end
-
-      def license(addon, eula_reader)
+      def find_license(addon, eula_reader)
         license_file = eula_reader.licenses[Y2Packager::License::DEFAULT_LANG]
         return false unless license_file
         content = Yast::SCR.Read(path(".target.string"), license_file)
+        return false unless content
 
-        license = Y2Packager::License.new(content: content)
-        Y2Packager::LicenseStore.instance.add_license_for(addon.identifier, license)
+        Y2Packager::ProductLicense.find(addon.identifier, content: content)
       end
     end
   end

test/registration/ui/addon_eula_dialog_test.rb

@@ -0,0 +1,100 @@
+#!/usr/bin/env rspec
+# ------------------------------------------------------------------------------
+# Copyright (c) 2018 SUSE LLC, All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of version 2 of the GNU General Public License as published by the
+# Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# ------------------------------------------------------------------------------
+
+require_relative "../../spec_helper"
+require "registration/ui/addon_eula_dialog"
+
+describe Registration::UI::AddonEulaDialog do
+  subject(:dialog) { described_class.new([addon]) }
+
+  let(:addon) do
+    addon_generator("name" => "SLES", "eula_url" => "https://suse.com/download/SLES/eula")
+  end
+
+  describe "#accept_eula" do
+    let(:eula_downloader) { instance_double(Registration::EulaDownloader, download: true) }
+    let(:eula_reader) { instance_double(Registration::EulaReader, licenses: licenses_files) }
+    let(:licenses_files) do
+      { Y2Packager::License::DEFAULT_LANG => "license.txt" }
+    end
+    let(:accepted?) { true }
+    let(:product_license) { instance_double(Y2Packager::ProductLicense, accepted?: accepted?) }
+    let(:license_content) { "content" }
+
+    before do
+      allow(Registration::EulaDownloader).to receive(:new).and_return(eula_downloader)
+      allow(Registration::EulaReader).to receive(:new).and_return(eula_reader)
+      allow(Y2Packager::ProductLicense).to receive(:find).and_return(product_license)
+      allow(Yast::SCR).to receive(:Read).with(Yast::Path.new(".target.string"), "license.txt")
+        .and_return(license_content)
+      allow(dialog).to receive(:setup_eula_dialog)
+      allow(dialog).to receive(:run_eula_dialog)
+    end
+
+    context "when the eula could not be downloaded" do
+      before do
+        allow(eula_downloader).to receive(:download).and_raise(StandardError)
+      end
+
+      it "returns :back" do
+        expect(dialog.send(:accept_eula, addon)).to eq(:back)
+      end
+    end
+
+    it "reads the license and asks for a already seen license with the same content" do
+      expect(Y2Packager::ProductLicense).to receive(:find)
+        .with(addon.identifier, content: "content").and_return(product_license)
+      dialog.send(:accept_eula, addon)
+    end
+
+    context "when the license file is not defined" do
+      let(:licenses_files) { {} }
+
+      it "does not ask for already seen licenses" do
+        expect(Y2Packager::ProductLicense).to_not receive(:find)
+        dialog.send(:accept_eula, addon)
+      end
+    end
+
+    context "when license file could not be read" do
+      let(:license_content) { nil }
+
+      it "does not ask for already seen licenses" do
+        expect(Y2Packager::ProductLicense).to_not receive(:find)
+        dialog.send(:accept_eula, addon)
+      end
+    end
+
+    context "when the license was previously accepted" do
+      let(:accepted?) { true }
+
+      it "returns :accepted" do
+        expect(dialog.send(:accept_eula, addon)).to eq(:accepted)
+      end
+
+      it "does not show the eula" do
+        expect(subject).to_not receive(:run_eula_dialog)
+        dialog.send(:accept_eula, addon)
+      end
+    end
+
+    context "when the license was not previously accepted" do
+      let(:accepted?) { false }
+
+      it "shows the eula" do
+        expect(subject).to receive(:run_eula_dialog)
+        dialog.send(:accept_eula, addon)
+      end
+    end
+  end
+end