pin apt for unit tests

Revert "fixing the unit test."

This reverts commit b8fa36a.

Author: tphoney

.fixtures.yml

@@ -1,6 +1,8 @@
 fixtures:
   repositories:
-    apt: "https://github.com/puppetlabs/puppetlabs-apt.git"
+    apt: 
+      repo: "https://github.com/puppetlabs/puppetlabs-apt.git"
+      branch: "1.8.x"
     stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
     firewall: "https://github.com/puppetlabs/puppetlabs-firewall.git"
     concat: "https://github.com/puppetlabs/puppetlabs-concat.git"

.gitignore

@@ -6,4 +6,5 @@ spec/fixtures/
 .bundle/
 coverage/
 .idea/
+log/
 *.iml

manifests/server/role.pp

@@ -31,7 +31,6 @@
     $environment  = []
   }
 
-  # Set the defaults for the postgresql_psql resource
   Postgresql_psql {
     db         => $db,
     port       => $port,
@@ -44,13 +43,11 @@
     ],
   }
 
-  postgresql_psql { "Check for existence of role '${username}'":
+  postgresql_psql { "CREATE ROLE ${username} ENCRYPTED PASSWORD ****":
     command     => "CREATE ROLE \"${username}\" ${password_sql} ${login_sql} ${createrole_sql} ${createdb_sql} ${superuser_sql} ${replication_sql} CONNECTION LIMIT ${connection_limit}",
     unless      => "SELECT rolname FROM pg_roles WHERE rolname='${username}'",
-    require     => Class['Postgresql::Server'],
     environment => $environment,
-    db          => $db,
-    port        => $port,
+    require     => Class['Postgresql::Server'],
   }
 
   postgresql_psql {"ALTER ROLE \"${username}\" ${superuser_sql}":

spec/spec_helper_acceptance.rb

@@ -99,7 +99,7 @@ def psql(psql_cmd, user = 'postgres', exit_codes = [0,1], &block)
       end
 
       on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
-      on host, puppet('module','install','puppetlabs-apt'), { :acceptable_exit_codes => [0,1] }
+      on host, puppet('module','install','puppetlabs-apt', '--version', '1.8.0', '--force'), { :acceptable_exit_codes => [0,1] }
       on host, puppet('module','install','--force','puppetlabs-concat'), { :acceptable_exit_codes => [0,1] }
     end
 

spec/unit/defines/server/role_spec.rb

@@ -28,8 +28,8 @@
   end
 
   it { is_expected.to contain_postgresql__server__role('test') }
-  it 'should Check for existence of role "test"' do
-    is_expected.to contain_postgresql_psql("Check for existence of role 'test'").with({
+  it 'should have create role for "test" user with password as ****' do
+    is_expected.to contain_postgresql_psql('CREATE ROLE test ENCRYPTED PASSWORD ****').with({
       'command'     => "CREATE ROLE \"test\" ENCRYPTED PASSWORD '$NEWPGPASSWD' LOGIN NOCREATEROLE NOCREATEDB NOSUPERUSER  CONNECTION LIMIT -1",
       'environment' => "NEWPGPASSWD=new-pa$s",
       'unless'      => "SELECT rolname FROM pg_roles WHERE rolname='test'",