Merge pull request #6542 from hstastna/Cancel_after_applying_changes_…

…Compare

Display Cancel after applying changes in non-explorer Compare screen

app/controllers/application_controller/compare.rb

@@ -420,7 +420,7 @@ def drift_same
   # AJAX driven routine to check for changes in ANY field on the form
   def sections_field_changed
     @keep_compare = true
-    @explorer = %w[VMs Templates].include?(session[:db_title])
+    @explorer = %w[VMs Templates].include?(session[:db_title]) && @display.nil?
     if params[:check] == "drift"
       section_checked(:drift)
     elsif params[:check] == "compare_miq"

spec/controllers/application_controller/compare_spec.rb

@@ -166,6 +166,34 @@ def init_fields_and_results(clusters)
       controller.send(:sections_field_changed)
       expect(session[:selected_sections]).to eq(["_model_", "hardware"])
     end
+
+    context 'changes in Comparison Sections' do
+      before do
+        allow(controller).to receive(:render)
+        allow(controller).to receive(:session).and_return(:db_title => 'VMs')
+        controller.instance_variable_set(:@display, 'instances')
+        controller.params = {:check => 'true'}
+      end
+
+      it 'sets @explorer to false' do
+        controller.send(:sections_field_changed)
+        expect(controller.instance_variable_get(:@explorer)).to be(false)
+      end
+
+      it 'calls set_checked_sections according to the params' do
+        expect(controller).to receive(:set_checked_sections)
+        controller.send(:sections_field_changed)
+      end
+
+      context 'explorer screen' do
+        before { controller.instance_variable_set(:@display, nil) }
+
+        it 'sets @explorer to true' do
+          controller.send(:sections_field_changed)
+          expect(controller.instance_variable_get(:@explorer)).to be(true)
+        end
+      end
+    end
   end
 
   context 'drifts' do