[NEP-18619]: Rspec fixes

Author: soundarya-mv

lib/superset/dashboard/datasets/list.rb

@@ -50,7 +50,7 @@ def datasets_details
         private
 
         def filter_dataset_ids
-          @filter_dataset_ids ||= Superset::Dashboard::Filters::List.new(id).perform
+          @filter_dataset_ids ||= Dashboard::Filters::List.new(id).perform
         end
 
         def filter_datasets(filter_dataset_ids_not_used_in_charts)

lib/superset/services/duplicate_dashboard.rb

@@ -94,18 +94,16 @@ def duplicate_source_dashboard_datasets
           # reason: there is a bug(or feature) in the SS API where a dataset name must be uniq when duplicating.  
           # (note however renaming in the GUI to a dup name works fine)
           new_dataset_name = "#{dataset[:datasource_name]}-#{target_schema}"
-          existing_datasets = Dataset::List.new(title_equals: new_dataset_name, schema_equals: source_dataset.schema).result
-          if existing_dataset.any?
+          existing_datasets = Superset::Dataset::List.new(title_equals: new_dataset_name, schema_equals: target_schema).result
+          if existing_datasets.any?
             new_dataset_id = existing_datasets[0]["id"] # assuming that we do not name multiple datasets with same name in a single schema
           else
             new_dataset_id = Superset::Dataset::Duplicate.new(source_dataset_id: dataset[:id], new_dataset_name: new_dataset_name).perform
+            # update the new dataset with the target schema and target database
+            Superset::Dataset::UpdateSchema.new(source_dataset_id: new_dataset_id, target_database_id: target_database_id, target_schema: target_schema).perform
           end
-
           # keep track of the previous dataset and the matching new dataset_id
           dataset_duplication_tracker <<  { source_dataset_id: dataset[:id], new_dataset_id: new_dataset_id }
-
-          # update the new dataset with the target schema and target database
-          Superset::Dataset::UpdateSchema.new(source_dataset_id: new_dataset_id, target_database_id: target_database_id, target_schema: target_schema).perform
         end
       end
 

spec/superset/services/duplicate_dashboard_spec.rb

@@ -107,16 +107,18 @@
     context 'with valid params' do
       before do
         # duplicating the current datasets
-        expect(Superset::Dataset::Duplicate).to receive(:new).with(source_dataset_id: source_dataset_1, new_dataset_name: "Dataset 1-schema_two").and_return(double(perform: new_dataset_1))
+        expect(Superset::Dataset::Duplicate).not_to receive(:new).with(source_dataset_id: source_dataset_1, new_dataset_name: "Dataset 1-schema_two")
         expect(Superset::Dataset::Duplicate).to receive(:new).with(source_dataset_id: source_dataset_2, new_dataset_name: "Dataset 2-schema_two").and_return(double(perform: new_dataset_2))
 
         # updating the new datasets to point to the target schema and target database
-        expect(Superset::Dataset::UpdateSchema).to receive(:new).with(source_dataset_id: new_dataset_1, target_database_id: target_database_id, target_schema: target_schema).and_return(double(perform: new_dataset_1))
+        expect(Superset::Dataset::UpdateSchema).not_to receive(:new).with(source_dataset_id: new_dataset_1, target_database_id: target_database_id, target_schema: target_schema)
         expect(Superset::Dataset::UpdateSchema).to receive(:new).with(source_dataset_id: new_dataset_2, target_database_id: target_database_id, target_schema: target_schema).and_return(double(perform: new_dataset_2))
 
         # getting the list of charts for the source dashboard
         allow(Superset::Dashboard::Charts::List).to receive(:new).with(source_dashboard_id).and_return(double(result: [{ 'slice_name' => "chart 1", "id" => source_chart_1}, { 'slice_name' => "chart 2", "id" => source_chart_2}])) # , chart_ids: [source_chart_1, source_chart_2]
         allow(Superset::Dashboard::Charts::List).to receive(:new).with(new_dashboard_id).and_return(double(result: [{ 'slice_name' => "chart 1", "id" => new_chart_1}, { 'slice_name' => "chart 2", "id" => new_chart_2}]))
+        allow(Superset::Dataset::List).to receive(:new).with(title_equals: "Dataset 1-schema_two", schema_equals: target_schema).and_return(double(result: [{id: 301}]))
+        allow(Superset::Dataset::List).to receive(:new).with(title_equals: "Dataset 2-schema_two", schema_equals: target_schema).and_return(double(result: []))
 
         # getting the current dataset_id for the new charts .. still pointing to the old datasets
         expect(Superset::Chart::Get).to receive(:new).with(new_chart_1).and_return(double(datasource_id: source_dataset_1))