From 89dfefdc4ae6f72e0633bd5d7bd7517ba9aefe1b Mon Sep 17 00:00:00 2001
From: Yann <me.show@gmail.com>
Date: Wed, 18 Jun 2014 15:50:58 +0200
Subject: [PATCH 01/13] add raw conf attributes

---
 attributes/default.rb                 | 3 +++
 templates/default/rabbitmq.config.erb | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/attributes/default.rb b/attributes/default.rb
index 4d8657e6..a5a11935 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -99,3 +99,6 @@
 default['rabbitmq']['policies']['ha-two']['priority'] = 1
 
 default['rabbitmq']['disabled_policies'] = []
+
+# conf
+default['rabbitmq']['conf'] = {}
\ No newline at end of file
diff --git a/templates/default/rabbitmq.config.erb b/templates/default/rabbitmq.config.erb
index e9854258..d554c6dd 100644
--- a/templates/default/rabbitmq.config.erb
+++ b/templates/default/rabbitmq.config.erb
@@ -44,4 +44,7 @@
     {default_user, <<"<%= node['rabbitmq']['default_user'] %>">>},
     {default_pass, <<"<%= node['rabbitmq']['default_pass'] %>">>}
   ]}
+<% node['rabbitmq']['conf'].each do |key,value|  -%>
+	,{key, value}
+<% end -%>
 ].

From 17153a0da4cbd1706cc963acf16d09e91cebbeca Mon Sep 17 00:00:00 2001
From: Yann <me.show@gmail.com>
Date: Wed, 18 Jun 2014 15:58:50 +0200
Subject: [PATCH 02/13] fix error

---
 templates/default/rabbitmq.config.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/default/rabbitmq.config.erb b/templates/default/rabbitmq.config.erb
index d554c6dd..81d1611d 100644
--- a/templates/default/rabbitmq.config.erb
+++ b/templates/default/rabbitmq.config.erb
@@ -45,6 +45,6 @@
     {default_pass, <<"<%= node['rabbitmq']['default_pass'] %>">>}
   ]}
 <% node['rabbitmq']['conf'].each do |key,value|  -%>
-	,{key, value}
+	,{<%= key %>, <%= value %>}
 <% end -%>
 ].

From 0008eac18718188fff6af78d98ea063f0d919e7a Mon Sep 17 00:00:00 2001
From: JJ Asghar <jj@getchef.com>
Date: Wed, 26 Nov 2014 13:25:27 -0600
Subject: [PATCH 03/13] Updated to 3.4.2 release

- Updated for the new release of RabbitMQ release 3.4.2
- Removed the Centos 5.10 from integration testing
- Updated the Gemfile for testing
---
 .kitchen.yml          | 1 -
 CHANGELOG.md          | 6 ++++++
 attributes/default.rb | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.kitchen.yml b/.kitchen.yml
index d5711222..b03bb8f9 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -5,7 +5,6 @@ provisioner:
   name: chef_zero
 
 platforms:
-  - name: centos-5.10
   - name: centos-6.5
   - name: ubuntu-12.04
   - name: ubuntu-14.04
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3d2b71a..78eaa334 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@ rabbitmq Cookbook CHANGELOG
 ===========================
 This file is used to list changes made in each version of the rabbitmq cookbook.
 
+v3.5.0 (2014-11-26)
+-------------------
+Updated for the new release of RabbitMQ release 3.4.2
+Removed the Centos 5.10 from integration testing
+Updated the Gemfile for testing
+
 v3.4.0 (2014-11-23)
 -------------------
 - Updated the RuboCop camel case
diff --git a/attributes/default.rb b/attributes/default.rb
index 4a6b8160..123ca5ad 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -1,5 +1,5 @@
 # Latest RabbitMQ.com version to install
-default['rabbitmq']['version'] = '3.3.5'
+default['rabbitmq']['version'] = '3.4.2'
 # The distro versions may be more stable and have back-ported patches
 default['rabbitmq']['use_distro_version'] = false
 

From 1919dc6377781a071fd893483cad7a5541dcc601 Mon Sep 17 00:00:00 2001
From: JJ Asghar <jj@getchef.com>
Date: Fri, 21 Nov 2014 15:04:26 -0600
Subject: [PATCH 04/13] WIP: commit to start chefspec being happy

---
 Gemfile              | 2 +-
 spec/default_spec.rb | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 spec/default_spec.rb

diff --git a/Gemfile b/Gemfile
index e16adef1..2bbc9a66 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 group :lint do
   gem 'foodcritic', '~> 4.0'
-  gem 'rubocop', '~> 0.18'
+  gem 'rubocop', '~> 0.23'
   gem 'rainbow', '< 2.0'
 end
 
diff --git a/spec/default_spec.rb b/spec/default_spec.rb
new file mode 100644
index 00000000..a14eef36
--- /dev/null
+++ b/spec/default_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe 'rabbitmq::default' do
+  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+
+  it 'installs logrotate' do
+    expect(chef_run).to install_package('logrotate')
+  end
+end

From f6f647d03db4cb883b269d538e7e8081922a3210 Mon Sep 17 00:00:00 2001
From: JJ Asghar <jj@getchef.com>
Date: Wed, 26 Nov 2014 19:32:22 -0600
Subject: [PATCH 05/13] Chefspec is the best spec

This is an inital commit of some generic chefspec
tests for the rabbitmq cookbook. I've tied it up to
the `rake travis` task so when this is merged we can
have it run as part of the PR process.

Again this is just an example and a start, we can attempt
to test the LWRPs at a later date.

Comments are more than welcome.
---
 Berksfile                           |  2 +-
 Gemfile                             |  1 +
 spec/default_spec.rb                | 48 +++++++++++++++++++++++++++--
 spec/mgmt_console_spec.rb           | 18 +++++++++++
 spec/plugin_management_spec.rb      | 18 +++++++++++
 spec/policy_management_spec.rb      | 18 +++++++++++
 spec/spec_helper.rb                 |  7 ++++-
 spec/user_management_spec.rb        | 22 +++++++++++++
 spec/virtualhost_management_spec.rb | 18 +++++++++++
 9 files changed, 148 insertions(+), 4 deletions(-)
 create mode 100644 spec/mgmt_console_spec.rb
 create mode 100644 spec/plugin_management_spec.rb
 create mode 100644 spec/policy_management_spec.rb
 create mode 100644 spec/user_management_spec.rb
 create mode 100644 spec/virtualhost_management_spec.rb

diff --git a/Berksfile b/Berksfile
index d17a8e2e..8338f50b 100644
--- a/Berksfile
+++ b/Berksfile
@@ -1,4 +1,4 @@
-site :opscode
+source 'https://supermarket.getchef.com'
 
 metadata
 
diff --git a/Gemfile b/Gemfile
index 2bbc9a66..d23984f0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,6 +9,7 @@ end
 group :unit do
   gem 'berkshelf'
   gem 'chefspec'
+  gem 'fauxhai'
 end
 
 group :kitchen_common do
diff --git a/spec/default_spec.rb b/spec/default_spec.rb
index a14eef36..b3fcd665 100644
--- a/spec/default_spec.rb
+++ b/spec/default_spec.rb
@@ -2,8 +2,52 @@
 
 describe 'rabbitmq::default' do
   let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:file_cache_path) { Chef::Config[:file_cache_path] }
 
-  it 'installs logrotate' do
-    expect(chef_run).to install_package('logrotate')
+  version = '3.3.5'
+
+  it 'creates a directory for mnesiadir' do
+    expect(chef_run).to create_directory('/var/lib/rabbitmq/mnesia')
+  end
+
+  it 'creates a template rabbitmq-env.conf with attributes' do
+    expect(chef_run).to create_template('/etc/rabbitmq/rabbitmq-env.conf').with(
+      :user => 'root',
+      :group => 'root',
+      :source => 'rabbitmq-env.conf.erb',
+      :mode => 00644)
+  end
+
+  it 'should create the directory /var/lib/rabbitmq/mnesia' do
+    expect(chef_run).to create_directory('/var/lib/rabbitmq/mnesia').with(
+     :user => 'rabbitmq',
+     :group => 'rabbitmq',
+     :mode => '775'
+   )
+  end
+
+  it 'enables a rabbitmq service' do
+    expect(chef_run).to enable_service('rabbitmq-server')
+  end
+
+  it 'start a rabbitmq service' do
+    expect(chef_run).to start_service('rabbitmq-server')
+  end
+
+  it 'creates a rabbitmq-server rpm in the cache path' do
+    expect(chef_run).to create_remote_file_if_missing("#{file_cache_path}/rabbitmq-server-#{version}-1.noarch.rpm")
+  end
+
+  it 'installs the rabbitmq-server rpm_package with the default action' do
+    expect(chef_run).to install_rpm_package("#{Chef::Config[:file_cache_path]}/rabbitmq-server-#{version}-1.noarch.rpm")
+  end
+
+  it 'creates a template rabbitmq.config with attributes' do
+    expect(chef_run).to create_template('/etc/rabbitmq/rabbitmq.config').with(
+      :user => 'root',
+      :group => 'root',
+      :source => 'rabbitmq.config.erb',
+      :mode => 00644)
   end
+
 end
diff --git a/spec/mgmt_console_spec.rb b/spec/mgmt_console_spec.rb
new file mode 100644
index 00000000..25667104
--- /dev/null
+++ b/spec/mgmt_console_spec.rb
@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe 'rabbitmq::mgmt_console' do
+  let(:chef_run) do
+    ChefSpec::Runner.new do |node|
+      node.default['rabbitmq'] = {
+        ['version'] => '3.3.5-1'
+      }
+    end.converge(described_recipe)
+  end
+
+  let(:file_cache_path) { Chef::Config[:file_cache_path] }
+
+  it 'includes the `default` recipe' do
+    expect(chef_run).to include_recipe('rabbitmq::default')
+  end
+
+end
diff --git a/spec/plugin_management_spec.rb b/spec/plugin_management_spec.rb
new file mode 100644
index 00000000..5012c72c
--- /dev/null
+++ b/spec/plugin_management_spec.rb
@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe 'rabbitmq::plugin_management' do
+  let(:chef_run) do
+    ChefSpec::Runner.new do |node|
+      node.default['rabbitmq'] = {
+        ['version'] => '3.3.5-1'
+      }
+    end.converge(described_recipe)
+  end
+
+  let(:file_cache_path) { Chef::Config[:file_cache_path] }
+
+  it 'includes the `default` recipe' do
+    expect(chef_run).to include_recipe('rabbitmq::default')
+  end
+
+end
diff --git a/spec/policy_management_spec.rb b/spec/policy_management_spec.rb
new file mode 100644
index 00000000..d23fa59b
--- /dev/null
+++ b/spec/policy_management_spec.rb
@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe 'rabbitmq::policy_management' do
+  let(:chef_run) do
+    ChefSpec::Runner.new do |node|
+      node.default['rabbitmq'] = {
+        ['version'] => '3.3.5-1'
+      }
+    end.converge(described_recipe)
+  end
+
+  let(:file_cache_path) { Chef::Config[:file_cache_path] }
+
+  it 'includes the `default` recipe' do
+    expect(chef_run).to include_recipe('rabbitmq::default')
+  end
+
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 4e000048..50f34575 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,4 +1,9 @@
 require 'chefspec'
 require 'chefspec/berkshelf'
+require 'fauxhai'
+ChefSpec::Coverage.start!
 
-at_exit { ChefSpec::Coverage.report! }
+RSpec.configure do |config|
+  config.platform = 'redhat'
+  config.version = '6.5'
+end
diff --git a/spec/user_management_spec.rb b/spec/user_management_spec.rb
new file mode 100644
index 00000000..1aafda55
--- /dev/null
+++ b/spec/user_management_spec.rb
@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe 'rabbitmq::user_management' do
+  let(:chef_run) do
+    ChefSpec::Runner.new do |node|
+      node.default['rabbitmq'] = {
+        ['version'] => '3.3.5-1'
+      }
+    end.converge(described_recipe)
+  end
+
+  let(:file_cache_path) { Chef::Config[:file_cache_path] }
+
+  it 'includes the `default` recipe' do
+    expect(chef_run).to include_recipe('rabbitmq::default')
+  end
+
+  it 'includes the `virtualhost_management` recipe' do
+    expect(chef_run).to include_recipe('rabbitmq::virtualhost_management')
+  end
+
+end
diff --git a/spec/virtualhost_management_spec.rb b/spec/virtualhost_management_spec.rb
new file mode 100644
index 00000000..9dce03c9
--- /dev/null
+++ b/spec/virtualhost_management_spec.rb
@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe 'rabbitmq::virtualhost_management' do
+  let(:chef_run) do
+    ChefSpec::Runner.new do |node|
+      node.default['rabbitmq'] = {
+        ['version'] => '3.3.5-1'
+      }
+    end.converge(described_recipe)
+  end
+
+  let(:file_cache_path) { Chef::Config[:file_cache_path] }
+
+  it 'includes the `default` recipe' do
+    expect(chef_run).to include_recipe('rabbitmq::default')
+  end
+
+end

From e83f45847ac9a846fecfb2b348a1f7260a207136 Mon Sep 17 00:00:00 2001
From: JJ Asghar <jj@getchef.com>
Date: Wed, 26 Nov 2014 19:48:47 -0600
Subject: [PATCH 06/13] updated to Chef::ServerRunner

---
 spec/default_spec.rb                | 2 +-
 spec/mgmt_console_spec.rb           | 2 +-
 spec/plugin_management_spec.rb      | 2 +-
 spec/policy_management_spec.rb      | 2 +-
 spec/user_management_spec.rb        | 2 +-
 spec/virtualhost_management_spec.rb | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spec/default_spec.rb b/spec/default_spec.rb
index b3fcd665..58a9919c 100644
--- a/spec/default_spec.rb
+++ b/spec/default_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'rabbitmq::default' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::ServerRunner.new.converge(described_recipe) }
   let(:file_cache_path) { Chef::Config[:file_cache_path] }
 
   version = '3.3.5'
diff --git a/spec/mgmt_console_spec.rb b/spec/mgmt_console_spec.rb
index 25667104..678708ee 100644
--- a/spec/mgmt_console_spec.rb
+++ b/spec/mgmt_console_spec.rb
@@ -2,7 +2,7 @@
 
 describe 'rabbitmq::mgmt_console' do
   let(:chef_run) do
-    ChefSpec::Runner.new do |node|
+    ChefSpec::ServerRunner.new do |node|
       node.default['rabbitmq'] = {
         ['version'] => '3.3.5-1'
       }
diff --git a/spec/plugin_management_spec.rb b/spec/plugin_management_spec.rb
index 5012c72c..5e238b7c 100644
--- a/spec/plugin_management_spec.rb
+++ b/spec/plugin_management_spec.rb
@@ -2,7 +2,7 @@
 
 describe 'rabbitmq::plugin_management' do
   let(:chef_run) do
-    ChefSpec::Runner.new do |node|
+    ChefSpec::ServerRunner.new do |node|
       node.default['rabbitmq'] = {
         ['version'] => '3.3.5-1'
       }
diff --git a/spec/policy_management_spec.rb b/spec/policy_management_spec.rb
index d23fa59b..1b21642b 100644
--- a/spec/policy_management_spec.rb
+++ b/spec/policy_management_spec.rb
@@ -2,7 +2,7 @@
 
 describe 'rabbitmq::policy_management' do
   let(:chef_run) do
-    ChefSpec::Runner.new do |node|
+    ChefSpec::ServerRunner.new do |node|
       node.default['rabbitmq'] = {
         ['version'] => '3.3.5-1'
       }
diff --git a/spec/user_management_spec.rb b/spec/user_management_spec.rb
index 1aafda55..dce576ab 100644
--- a/spec/user_management_spec.rb
+++ b/spec/user_management_spec.rb
@@ -2,7 +2,7 @@
 
 describe 'rabbitmq::user_management' do
   let(:chef_run) do
-    ChefSpec::Runner.new do |node|
+    ChefSpec::ServerRunner.new do |node|
       node.default['rabbitmq'] = {
         ['version'] => '3.3.5-1'
       }
diff --git a/spec/virtualhost_management_spec.rb b/spec/virtualhost_management_spec.rb
index 9dce03c9..43510a61 100644
--- a/spec/virtualhost_management_spec.rb
+++ b/spec/virtualhost_management_spec.rb
@@ -2,7 +2,7 @@
 
 describe 'rabbitmq::virtualhost_management' do
   let(:chef_run) do
-    ChefSpec::Runner.new do |node|
+    ChefSpec::ServerRunner.new do |node|
       node.default['rabbitmq'] = {
         ['version'] => '3.3.5-1'
       }

From c731be1936fa15da808c40555d8f3c53d7dae87f Mon Sep 17 00:00:00 2001
From: JJ Asghar <jj@getchef.com>
Date: Wed, 26 Nov 2014 20:23:30 -0600
Subject: [PATCH 07/13] added a check so it traviss slave doesnt write to read
 a RO location

---
 recipes/default.rb   |  2 +-
 spec/default_spec.rb | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/recipes/default.rb b/recipes/default.rb
index 4736f0d6..ec5238b9 100644
--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -166,7 +166,7 @@ class Chef::Resource # rubocop:disable all
   notifies :restart, "service[#{node['rabbitmq']['service_name']}]", :immediately
 end
 
-if File.exist?(node['rabbitmq']['erlang_cookie_path'])
+if File.exist?(node['rabbitmq']['erlang_cookie_path']) && File.readable?((node['rabbitmq']['erlang_cookie_path']))
   existing_erlang_key =  File.read(node['rabbitmq']['erlang_cookie_path']).strip
 else
   existing_erlang_key = ''
diff --git a/spec/default_spec.rb b/spec/default_spec.rb
index 58a9919c..5415d1c0 100644
--- a/spec/default_spec.rb
+++ b/spec/default_spec.rb
@@ -1,7 +1,14 @@
 require 'spec_helper'
 
 describe 'rabbitmq::default' do
-  let(:chef_run) { ChefSpec::ServerRunner.new.converge(described_recipe) }
+  let(:chef_run) do
+    ChefSpec::ServerRunner.new do |node|
+      node.default['rabbitmq'] = {
+        ['version'] => '3.3.5'
+      }
+    end.converge(described_recipe)
+  end
+
   let(:file_cache_path) { Chef::Config[:file_cache_path] }
 
   version = '3.3.5'
@@ -35,7 +42,7 @@
   end
 
   it 'creates a rabbitmq-server rpm in the cache path' do
-    expect(chef_run).to create_remote_file_if_missing("#{file_cache_path}/rabbitmq-server-#{version}-1.noarch.rpm")
+    expect(chef_run).to create_remote_file_if_missing("#{Chef::Config[:file_cache_path]}/rabbitmq-server-#{version}-1.noarch.rpm")
   end
 
   it 'installs the rabbitmq-server rpm_package with the default action' do

From bbe3313a50932aa0e91723f164e8da64ed536b53 Mon Sep 17 00:00:00 2001
From: JJ Asghar <jj@getchef.com>
Date: Sat, 29 Nov 2014 14:48:13 -0600
Subject: [PATCH 08/13] Updated per @jklare suggestions

I attempted to get the version in object, but i couldn't seem to get it
correct. Any advice or suggestions are more than welcome.

I'd like to merge this ASAP so I can update to 3.4.2 this week.
---
 spec/default_spec.rb                | 15 ++++++---------
 spec/mgmt_console_spec.rb           |  6 +-----
 spec/plugin_management_spec.rb      |  6 +-----
 spec/policy_management_spec.rb      |  6 +-----
 spec/user_management_spec.rb        |  6 +-----
 spec/virtualhost_management_spec.rb |  6 +-----
 6 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/spec/default_spec.rb b/spec/default_spec.rb
index 5415d1c0..aae6231a 100644
--- a/spec/default_spec.rb
+++ b/spec/default_spec.rb
@@ -1,18 +1,15 @@
 require 'spec_helper'
 
 describe 'rabbitmq::default' do
+
+  version = '3.3.5-1'
+
   let(:chef_run) do
-    ChefSpec::ServerRunner.new do |node|
-      node.default['rabbitmq'] = {
-        ['version'] => '3.3.5'
-      }
-    end.converge(described_recipe)
+    ChefSpec::ServerRunner.new.converge(described_recipe)
   end
 
   let(:file_cache_path) { Chef::Config[:file_cache_path] }
 
-  version = '3.3.5'
-
   it 'creates a directory for mnesiadir' do
     expect(chef_run).to create_directory('/var/lib/rabbitmq/mnesia')
   end
@@ -42,11 +39,11 @@
   end
 
   it 'creates a rabbitmq-server rpm in the cache path' do
-    expect(chef_run).to create_remote_file_if_missing("#{Chef::Config[:file_cache_path]}/rabbitmq-server-#{version}-1.noarch.rpm")
+    expect(chef_run).to create_remote_file_if_missing("#{Chef::Config[:file_cache_path]}/rabbitmq-server-#{version}.noarch.rpm")
   end
 
   it 'installs the rabbitmq-server rpm_package with the default action' do
-    expect(chef_run).to install_rpm_package("#{Chef::Config[:file_cache_path]}/rabbitmq-server-#{version}-1.noarch.rpm")
+    expect(chef_run).to install_rpm_package("#{Chef::Config[:file_cache_path]}/rabbitmq-server-#{version}.noarch.rpm")
   end
 
   it 'creates a template rabbitmq.config with attributes' do
diff --git a/spec/mgmt_console_spec.rb b/spec/mgmt_console_spec.rb
index 678708ee..f5f4ba73 100644
--- a/spec/mgmt_console_spec.rb
+++ b/spec/mgmt_console_spec.rb
@@ -2,11 +2,7 @@
 
 describe 'rabbitmq::mgmt_console' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new do |node|
-      node.default['rabbitmq'] = {
-        ['version'] => '3.3.5-1'
-      }
-    end.converge(described_recipe)
+    ChefSpec::ServerRunner.new.converge(described_recipe)
   end
 
   let(:file_cache_path) { Chef::Config[:file_cache_path] }
diff --git a/spec/plugin_management_spec.rb b/spec/plugin_management_spec.rb
index 5e238b7c..2c2bf95b 100644
--- a/spec/plugin_management_spec.rb
+++ b/spec/plugin_management_spec.rb
@@ -2,11 +2,7 @@
 
 describe 'rabbitmq::plugin_management' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new do |node|
-      node.default['rabbitmq'] = {
-        ['version'] => '3.3.5-1'
-      }
-    end.converge(described_recipe)
+    ChefSpec::ServerRunner.new.converge(described_recipe)
   end
 
   let(:file_cache_path) { Chef::Config[:file_cache_path] }
diff --git a/spec/policy_management_spec.rb b/spec/policy_management_spec.rb
index 1b21642b..a3e5a575 100644
--- a/spec/policy_management_spec.rb
+++ b/spec/policy_management_spec.rb
@@ -2,11 +2,7 @@
 
 describe 'rabbitmq::policy_management' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new do |node|
-      node.default['rabbitmq'] = {
-        ['version'] => '3.3.5-1'
-      }
-    end.converge(described_recipe)
+    ChefSpec::ServerRunner.new.converge(described_recipe)
   end
 
   let(:file_cache_path) { Chef::Config[:file_cache_path] }
diff --git a/spec/user_management_spec.rb b/spec/user_management_spec.rb
index dce576ab..d3bb3b0c 100644
--- a/spec/user_management_spec.rb
+++ b/spec/user_management_spec.rb
@@ -2,11 +2,7 @@
 
 describe 'rabbitmq::user_management' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new do |node|
-      node.default['rabbitmq'] = {
-        ['version'] => '3.3.5-1'
-      }
-    end.converge(described_recipe)
+    ChefSpec::ServerRunner.new.converge(described_recipe)
   end
 
   let(:file_cache_path) { Chef::Config[:file_cache_path] }
diff --git a/spec/virtualhost_management_spec.rb b/spec/virtualhost_management_spec.rb
index 43510a61..ff29fae9 100644
--- a/spec/virtualhost_management_spec.rb
+++ b/spec/virtualhost_management_spec.rb
@@ -2,11 +2,7 @@
 
 describe 'rabbitmq::virtualhost_management' do
   let(:chef_run) do
-    ChefSpec::ServerRunner.new do |node|
-      node.default['rabbitmq'] = {
-        ['version'] => '3.3.5-1'
-      }
-    end.converge(described_recipe)
+    ChefSpec::ServerRunner.new.converge(described_recipe)
   end
 
   let(:file_cache_path) { Chef::Config[:file_cache_path] }

From 6741a5da97bd973aeaffac32cc752a06537a0e2c Mon Sep 17 00:00:00 2001
From: JJ Asghar <jj@getchef.com>
Date: Mon, 1 Dec 2014 22:27:18 -0600
Subject: [PATCH 09/13] Fix Travis test failure

https://travis-ci.org/jjasghar/rabbitmq/builds/42697610
---
 attributes/default.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/attributes/default.rb b/attributes/default.rb
index fa4ab2d8..d5dfb0e4 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -105,4 +105,4 @@
 default['rabbitmq']['disabled_policies'] = []
 
 # conf
-default['rabbitmq']['conf'] = {}
\ No newline at end of file
+default['rabbitmq']['conf'] = {}

From d2a90b03abb62ebe4989a2ba9d55a336809310b7 Mon Sep 17 00:00:00 2001
From: JJ Asghar <jj@getchef.com>
Date: Tue, 2 Dec 2014 12:26:19 -0600
Subject: [PATCH 10/13] Added change from @dggc

Pulled this from https://github.com/jjasghar/rabbitmq/pull/160
---
 recipes/plugin_management.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/recipes/plugin_management.rb b/recipes/plugin_management.rb
index f6fd0399..ea8725ab 100644
--- a/recipes/plugin_management.rb
+++ b/recipes/plugin_management.rb
@@ -31,6 +31,5 @@
 node['rabbitmq']['disabled_plugins'].each do |plugin|
   rabbitmq_plugin plugin do
     action :disable
-    notifies :restart, "service[#{node['rabbitmq']['service_name']}]"
   end
 end

From af93bff626b95958437cd6d178d1b0f78ceffc29 Mon Sep 17 00:00:00 2001
From: JJ Asghar <jj@getchef.com>
Date: Wed, 26 Nov 2014 13:25:27 -0600
Subject: [PATCH 11/13] Updated to 3.4.2 release

- Updated for the new release of RabbitMQ release 3.4.2
- Removed the Centos 5.10 from integration testing
- Updated the Gemfile for testing
---
 .kitchen.yml          | 1 -
 CHANGELOG.md          | 6 ++++++
 attributes/default.rb | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.kitchen.yml b/.kitchen.yml
index d5711222..b03bb8f9 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -5,7 +5,6 @@ provisioner:
   name: chef_zero
 
 platforms:
-  - name: centos-5.10
   - name: centos-6.5
   - name: ubuntu-12.04
   - name: ubuntu-14.04
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3d2b71a..78eaa334 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@ rabbitmq Cookbook CHANGELOG
 ===========================
 This file is used to list changes made in each version of the rabbitmq cookbook.
 
+v3.5.0 (2014-11-26)
+-------------------
+Updated for the new release of RabbitMQ release 3.4.2
+Removed the Centos 5.10 from integration testing
+Updated the Gemfile for testing
+
 v3.4.0 (2014-11-23)
 -------------------
 - Updated the RuboCop camel case
diff --git a/attributes/default.rb b/attributes/default.rb
index 5c542cc7..f42173f7 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -1,5 +1,5 @@
 # Latest RabbitMQ.com version to install
-default['rabbitmq']['version'] = '3.3.5'
+default['rabbitmq']['version'] = '3.4.2'
 # The distro versions may be more stable and have back-ported patches
 default['rabbitmq']['use_distro_version'] = false
 

From a36aed02217aecc2be91702d78d1e68295fef666 Mon Sep 17 00:00:00 2001
From: JJ Asghar <jj@getchef.com>
Date: Tue, 2 Dec 2014 12:26:19 -0600
Subject: [PATCH 12/13] Added change from @dggc

Pulled this from https://github.com/jjasghar/rabbitmq/pull/160
---
 recipes/plugin_management.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/recipes/plugin_management.rb b/recipes/plugin_management.rb
index f6fd0399..ea8725ab 100644
--- a/recipes/plugin_management.rb
+++ b/recipes/plugin_management.rb
@@ -31,6 +31,5 @@
 node['rabbitmq']['disabled_plugins'].each do |plugin|
   rabbitmq_plugin plugin do
     action :disable
-    notifies :restart, "service[#{node['rabbitmq']['service_name']}]"
   end
 end

From 2e6f545526c7ec2f494b8a47d9a8d01da2ff7b98 Mon Sep 17 00:00:00 2001
From: JJ Asghar <jj@getchef.com>
Date: Tue, 2 Dec 2014 17:11:58 -0600
Subject: [PATCH 13/13] Upadated version to 3.4.2

---
 spec/default_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/default_spec.rb b/spec/default_spec.rb
index aae6231a..d1eb853c 100644
--- a/spec/default_spec.rb
+++ b/spec/default_spec.rb
@@ -2,7 +2,7 @@
 
 describe 'rabbitmq::default' do
 
-  version = '3.3.5-1'
+  version = '3.4.2-1'
 
   let(:chef_run) do
     ChefSpec::ServerRunner.new.converge(described_recipe)