Merge pull request #29 from hardening-io/update-common

update common Gemfile for chef11+12
dev-sec · May 12, 2015 · daabf9b · daabf9b
2 parents 8237446 + e763aac
commit daabf9b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,4 @@
+---
 rvm:
 - 1.9.3
 - 2.0.0
@@ -9,5 +10,5 @@ language: ruby
 bundler_args: "--without development integration openstack"
 matrix:
   exclude:
-    - rvm: 1.9.3
-      gemfile: Gemfile
+  - rvm: 1.9.3
+    gemfile: Gemfile
diff --git a/spec/unit/recipes/hardening_spec.rb b/spec/unit/recipes/hardening_spec.rb
@@ -10,8 +10,8 @@
 
   it 'should create a my.cnf file and protect it' do
 
-    expect(chef_run).to create_file(chef_run.node['mysql-hardening']['mysql-conf'])
-      .with(
+    expect(chef_run).to create_file(chef_run.node['mysql-hardening']['mysql-conf']).
+      with(
         mode:  '600',
         owner: 'root',
         group: 'root'
@@ -21,8 +21,8 @@
 
   it 'should create a hardening.cnf with the hardening configuration from a template' do
 
-    expect(chef_run).to create_template(chef_run.node['mysql-hardening']['hardening-conf'])
-      .with(
+    expect(chef_run).to create_template(chef_run.node['mysql-hardening']['hardening-conf']).
+      with(
         owner: chef_run.node['mysql-hardening']['user'],
         mode:  '750'
       )
@@ -31,8 +31,8 @@
 
   it 'should create the data directory and ensure permission' do
 
-    expect(chef_run).to create_directory(chef_run.node['mysql']['data_dir'])
-      .with(
+    expect(chef_run).to create_directory(chef_run.node['mysql']['data_dir']).
+      with(
         owner: chef_run.node['mysql-hardening']['user'],
         mode:  '755'
       )