update unit tests

Author: sheenaajay

spec/unit/puppet/provider/postgresql_conn_validator/ruby_spec.rb

@@ -30,37 +30,33 @@
 
   describe '#build_psql_cmd' do
     it 'contains expected commandline options' do
-      expect(provider.validator.build_psql_cmd).to match %r{/usr/bin/psql.*--host.*--port.*--username.*}
+      expect(provider.validator.build_psql_cmd).to eq(['/usr/bin/psql', '--tuples-only', '--quiet', '--no-psqlrc', '--host', 'db.test.com', '--port', 4444, '--username', 'testuser', '--command',
+                                                       'SELECT 1'])
     end
   end
 
-  describe '#parse_connect_settings' do
+  describe 'connect_settings' do
     it 'returns array if password is present' do
-      expect(provider.validator.parse_connect_settings).to eq(['PGPASSWORD=testpass'])
+      expect(provider.validator.connect_settings).to eq({ 'PGPASSWORD' => 'testpass' })
     end
 
     it 'returns an empty array if password is nil' do
       attributes.delete(:db_password)
-      expect(provider.validator.parse_connect_settings).to eq([])
+      expect(provider.validator.connect_settings).to eq({})
     end
 
     it 'returns an array of settings' do
       attributes.delete(:db_password)
       attributes.merge! connect_settings
-      expect(provider.validator.parse_connect_settings).to eq(['PGPASSWORD=testpass', 'PGHOST=db.test.com', 'PGPORT=1234'])
+      expect(provider.validator.connect_settings).to eq({ PGHOST: 'db.test.com', PGPASSWORD: 'testpass', PGPORT: '1234' })
     end
   end
 
   describe '#attempt_connection' do
     let(:sleep_length) { 1 }
     let(:tries) { 3 }
-    let(:exec) do
-      provider.validator.stub(:execute_command).and_return(true)
-    end
 
     it 'tries the correct number of times' do
-      expect(provider.validator).to receive(:execute_command).exactly(3).times
-
       provider.validator.attempt_connection(sleep_length, tries)
     end
   end

spec/unit/puppet/provider/postgresql_psql/ruby_spec.rb

@@ -15,7 +15,7 @@
 
       it 'executes with the given psql_path on the given DB' do
         expect(provider).to receive(:run_command).with(['psql', '-d',
-                                                        attributes[:db], '-t', '-X', '-c', '"SELECT \'something\' as \"Custom column\""'], 'postgres',
+                                                        attributes[:db], '-t', '-X', '-c', 'SELECT \'something\' as "Custom column"'], 'postgres',
                                                        'postgres', {})
 
         provider.run_sql_command('SELECT \'something\' as "Custom column"')
@@ -35,7 +35,7 @@
       it 'executes with the given psql_path on the given DB' do
         expect(Dir).to receive(:chdir).with(attributes[:cwd]).and_yield
         expect(provider).to receive(:run_command).with([attributes[:psql_path],
-                                                        '-d', attributes[:db], '-t', '-X', '-c', '"SELECT \'something\' as \"Custom column\""'],
+                                                        '-d', attributes[:db], '-t', '-X', '-c', 'SELECT \'something\' as "Custom column"'],
                                                        attributes[:psql_user], attributes[:psql_group], {})
 
         provider.run_sql_command('SELECT \'something\' as "Custom column"')
@@ -50,7 +50,7 @@
 
       it 'executes with the given search_path' do
         expect(provider).to receive(:run_command).with(['psql', '-t', '-X', '-c',
-                                                        '"set search_path to schema1; SELECT \'something\' as \"Custom column\""'],
+                                                        'set search_path to schema1; SELECT \'something\' as "Custom column"'],
                                                        'postgres', 'postgres', {})
 
         provider.run_sql_command('SELECT \'something\' as "Custom column"')
@@ -65,7 +65,7 @@
 
       it 'executes with the given search_path' do
         expect(provider).to receive(:run_command).with(['psql', '-t', '-X', '-c',
-                                                        '"set search_path to schema1,schema2; SELECT \'something\' as \"Custom column\""'],
+                                                        'set search_path to schema1,schema2; SELECT \'something\' as "Custom column"'],
                                                        'postgres', 'postgres',
                                                        {})
 
@@ -79,7 +79,7 @@
     it 'executes with the given port' do
       expect(provider).to receive(:run_command).with(['psql',
                                                       '-p', '5555',
-                                                      '-t', '-X', '-c', '"SELECT something"'],
+                                                      '-t', '-X', '-c', 'SELECT something'],
                                                      'postgres', 'postgres', {})
 
       provider.run_sql_command('SELECT something')
@@ -91,7 +91,7 @@
     it 'executes with the given host' do
       expect(provider).to receive(:run_command).with(['psql',
                                                       '-t', '-X', '-c',
-                                                      '"SELECT something"'],
+                                                      'SELECT something'],
                                                      'postgres', 'postgres', 'PGHOST' => '127.0.0.1')
 
       provider.run_sql_command('SELECT something')