(GH-cat-9) Rubocop fixes

Author: david22swan

spec/acceptance/db_spec.rb

@@ -4,45 +4,43 @@
 
 describe 'postgresql::server::db' do
   it 'creates a database' do
-    begin
-      tmpdir = run_shell('mktemp').stdout
-      pp = <<-MANIFEST
-        class { 'postgresql::server':
-          postgres_password => 'space password',
-        }
-        postgresql::server::tablespace { 'postgresql-test-db':
-          location => '#{tmpdir}',
-        } ->
-        postgresql::server::db { 'postgresql-test-db':
-          comment    => 'testcomment',
-          user       => 'test-user',
-          password   => 'test1',
-          tablespace => 'postgresql-test-db',
-        }
-      MANIFEST
+    tmpdir = run_shell('mktemp').stdout
+    pp = <<-MANIFEST
+      class { 'postgresql::server':
+        postgres_password => 'space password',
+      }
+      postgresql::server::tablespace { 'postgresql-test-db':
+        location => '#{tmpdir}',
+      } ->
+      postgresql::server::db { 'postgresql-test-db':
+        comment    => 'testcomment',
+        user       => 'test-user',
+        password   => 'test1',
+        tablespace => 'postgresql-test-db',
+      }
+    MANIFEST
 
-      idempotent_apply(pp)
+    idempotent_apply(pp)
 
-      # Verify that the postgres password works
-      run_shell("echo 'localhost:*:*:postgres:\'space password\'' > /root/.pgpass")
-      run_shell('chmod 600 /root/.pgpass')
-      run_shell("psql -U postgres -h localhost --command='\\l'")
+    # Verify that the postgres password works
+    run_shell("echo 'localhost:*:*:postgres:\'space password\'' > /root/.pgpass")
+    run_shell('chmod 600 /root/.pgpass')
+    run_shell("psql -U postgres -h localhost --command='\\l'")
 
-      result = psql('--command="select datname from pg_database" "postgresql-test-db"')
-      expect(result.stdout).to match(%r{postgresql-test-db})
-      expect(result.stderr).to eq('')
+    result = psql('--command="select datname from pg_database" "postgresql-test-db"')
+    expect(result.stdout).to match(%r{postgresql-test-db})
+    expect(result.stderr).to eq('')
 
-      result = psql('--command="SELECT 1 FROM pg_roles WHERE rolname=\'test-user\'"')
-      expect(result.stdout).to match(%r{\(1 row\)})
-      comment_information_function = if Gem::Version.new(postgresql_version) > Gem::Version.new('8.1')
-                                       'shobj_description'
-                                     else
-                                       'obj_description'
-                                     end
-      result = psql("--dbname postgresql-test-db --command=\"SELECT pg_catalog.#{comment_information_function}(d.oid, 'pg_database') FROM pg_catalog.pg_database d WHERE datname = 'postgresql-test-db' AND pg_catalog.#{comment_information_function}(d.oid, 'pg_database') = 'testcomment'\"") # rubocop:disable Layout/LineLength
-      expect(result.stdout).to match(%r{\(1 row\)})
-    ensure
-      psql('--command=\'drop database "postgresql-test-db"\'')
-    end
+    result = psql('--command="SELECT 1 FROM pg_roles WHERE rolname=\'test-user\'"')
+    expect(result.stdout).to match(%r{\(1 row\)})
+    comment_information_function = if Gem::Version.new(postgresql_version) > Gem::Version.new('8.1')
+                                     'shobj_description'
+                                   else
+                                     'obj_description'
+                                   end
+    result = psql("--dbname postgresql-test-db --command=\"SELECT pg_catalog.#{comment_information_function}(d.oid, 'pg_database') FROM pg_catalog.pg_database d WHERE datname = 'postgresql-test-db' AND pg_catalog.#{comment_information_function}(d.oid, 'pg_database') = 'testcomment'\"") # rubocop:disable Layout/LineLength
+    expect(result.stdout).to match(%r{\(1 row\)})
+  ensure
+    psql('--command=\'drop database "postgresql-test-db"\'')
   end
 end

spec/acceptance/server/schema_spec.rb

@@ -56,16 +56,14 @@ class { 'postgresql::server': }
   end
 
   it 'creates a schema for a user' do
-    begin
-      idempotent_apply(pp)
+    idempotent_apply(pp)
 
-      ## Check that the user can create a table in the database
-      psql('--command="create table psql_schema_tester.foo (foo int)" schema_test', 'psql_schema_tester') do |r|
-        expect(r.stdout).to match(%r{CREATE TABLE})
-        expect(r.stderr).to eq('')
-      end
-    ensure
-      psql('--command="drop table psql_schema_tester.foo" schema_test', 'psql_schema_tester')
+    ## Check that the user can create a table in the database
+    psql('--command="create table psql_schema_tester.foo (foo int)" schema_test', 'psql_schema_tester') do |r|
+      expect(r.stdout).to match(%r{CREATE TABLE})
+      expect(r.stderr).to eq('')
     end
+  ensure
+    psql('--command="drop table psql_schema_tester.foo" schema_test', 'psql_schema_tester')
   end
 end