The OnlineSearch injects the controller into its widget

yast · Jan 31, 2020 · a02bd2a · a02bd2a
1 parent e8c9c9b
commit a02bd2a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/src/lib/registration/dialogs/online_search.rb b/src/lib/registration/dialogs/online_search.rb
@@ -19,6 +19,7 @@
 
 require "yast"
 require "cwm/dialog"
+require "registration/controllers/package_search"
 require "registration/widgets/package_search"
 
 module Registration
@@ -57,7 +58,7 @@ def contents
       # @macro seeAbstractWidget
       def run
         ret = super
-        @selected_packages = ret == :next ? package_search_widget.selected_packages : []
+        @selected_packages = ret == :next ? controller.selected_packages : []
         ret
       end
 
@@ -72,7 +73,14 @@ def back_button
       #
       # @return [Registration::Widgets::PackageSearch]
       def package_search_widget
-        @package_search_widget ||= ::Registration::Widgets::PackageSearch.new
+        @package_search_widget ||= ::Registration::Widgets::PackageSearch.new(controller)
+      end
+
+      # Package search controller
+      #
+      # @return [Registration::Controllers::PackageSearch]
+      def controller
+        @controller ||= ::Registration::Controllers::PackageSearch.new
       end
     end
   end

diff --git a/src/lib/registration/widgets/package_search.rb b/src/lib/registration/widgets/package_search.rb
@@ -19,7 +19,6 @@
 
 require "yast"
 require "cwm/custom_widget"
-require "registration/controllers/package_search"
 require "registration/widgets/package_search_form"
 require "registration/widgets/remote_packages_table"
 require "registration/widgets/remote_package_details"
@@ -40,7 +39,9 @@ class PackageSearch < CWM::CustomWidget
       include Yast::Logger
 
       # Constructor
-      def initialize(controller = ::Registration::Controllers::PackageSearch.new)
+      #
+      # @param controller [Registration::Controllers::PackageSearch] Package search controller
+      def initialize(controller)
         textdomain "registration"
         self.handle_all_events = true
         @controller = controller

diff --git a/test/registration/dialogs/online_search_test.rb b/test/registration/dialogs/online_search_test.rb
@@ -26,7 +26,11 @@
 
   describe "#selected_packages" do
     let(:search_widget) do
-      Registration::Widgets::PackageSearch.new
+      Registration::Widgets::PackageSearch.new(controller)
+    end
+
+    let(:controller) do
+      Registration::Controllers::PackageSearch.new
     end
 
     let(:package) do
@@ -36,7 +40,9 @@
     before do
       allow(Registration::Widgets::PackageSearch).to receive(:new)
         .and_return(search_widget)
-      allow(search_widget).to receive(:selected_packages).and_return([package])
+      allow(Registration::Controllers::PackageSearch).to receive(:new)
+        .and_return(controller)
+      allow(controller).to receive(:selected_packages).and_return([package])
       allow(subject).to receive(:cwm_show).and_return(result)
     end