diff --git a/app/services/carto/visualizations_export_service_2.rb b/app/services/carto/visualizations_export_service_2.rb index 5982f39479..c56c1b9a68 100644 --- a/app/services/carto/visualizations_export_service_2.rb +++ b/app/services/carto/visualizations_export_service_2.rb @@ -23,6 +23,7 @@ require_dependency 'carto/export/data_import_exporter' # 2.1.4: link synchronizations with connections module Carto module VisualizationsExportService2Configuration + CURRENT_VERSION = '2.1.4'.freeze def compatible_version?(version) diff --git a/services/importer/spec/unit/connection_manager_spec.rb b/services/importer/spec/unit/connection_manager_spec.rb index eaf078d260..daf1c64aa5 100644 --- a/services/importer/spec/unit/connection_manager_spec.rb +++ b/services/importer/spec/unit/connection_manager_spec.rb @@ -88,9 +88,9 @@ describe Carto::ConnectionManager do expect(connection.id).not_to eq(connection1.id) end - it "builds new connection if user not saved" do + it 'builds new connection if user not saved' do unsaved_user = build(:carto_user_light) - connection_manager = Carto::ConnectionManager.new(unsaved_user) + connection_manager = described_class.new(unsaved_user) connection = connection_manager.create_db_connection( name: 'new_connection', provider: connection1.connector, @@ -156,12 +156,12 @@ describe Carto::ConnectionManager do expect(user.oauth_connections.find_by(connector: 'dropbox')).to eq(connection) end - it "creates new connections with optional parameters" do - Carto::ConnectionManager.any_instance.stubs(:oauth_connection_valid?).returns(true) + it 'creates new connections with optional parameters' do + described_class.any_instance.stubs(:oauth_connection_valid?).returns(true) connection = connection_manager.create_oauth_connection( service: 'bigquery', token: 'the-token', - parameters: { billing_project: 'billing-project'} + parameters: { billing_project: 'billing-project' } ) expect(user.oauth_connections.find_by(connector: 'bigquery')).to eq(connection) end diff --git a/spec/services/carto/visualizations_export_service_2_spec.rb b/spec/services/carto/visualizations_export_service_2_spec.rb index 0b9515053a..86abc1c6bc 100644 --- a/spec/services/carto/visualizations_export_service_2_spec.rb +++ b/spec/services/carto/visualizations_export_service_2_spec.rb @@ -737,7 +737,7 @@ describe Carto::VisualizationsExportService2 do layer_with_table.user_tables.first.id.should eq user_table.id end - it "links synchronizations with connections" do + it 'links synchronizations with connections' do connection_data = { name: 'AWS', connector: 'postgres', parameters: { @@ -747,12 +747,12 @@ describe Carto::VisualizationsExportService2 do } connection = create(:db_connection, connection_data.merge(user: @user)) exported_user = create(:carto_user, username: base_visualization_export[:user][:username]) - exported_connection = create(:db_connection, connection_data.merge(user: exported_user)) + create(:db_connection, connection_data.merge(user: exported_user)) visualization_with_sync_and_db_connection = export[:visualization] visualization_with_sync_and_db_connection[:synchronization].merge!( service_name: 'connector', - service_item_id:{ + service_item_id: { sql_query: 'SELECT * FROM world_borders_hd', import_as: 'world_borders_hd', connection_id: connection.id, @@ -760,10 +760,9 @@ describe Carto::VisualizationsExportService2 do }.to_json ) - visualization = - Carto::VisualizationsExportService2.new.build_visualization_from_json_export( - export.merge(visualization: visualization_with_sync_and_db_connection).to_json - ) + visualization = described_class.new.build_visualization_from_json_export( + export.merge(visualization: visualization_with_sync_and_db_connection).to_json + ) verify_visualization_vs_export(visualization, export[:visualization]) end @@ -1079,8 +1078,10 @@ describe Carto::VisualizationsExportService2 do }.to_json ) - export = Carto::VisualizationsExportService2.new.export_visualization_json_hash(@table_visualization.id, @user) - expect(JSON.parse(export[:visualization][:synchronization][:service_item_id])['connection_name']).to eq(connection.name) + export = described_class.new.export_visualization_json_hash(@table_visualization.id, @user) + expect( + JSON.parse(export[:visualization][:synchronization][:service_item_id])['connection_name'] + ).to eq(connection.name) synchronization.destroy end