fix chefstyle failures

autocorrects some merges that will be broken when the next
chefstyle is released.

also runs chefstyle after the travis tests, because i'd rather know
how the code is broken rather than how its not pretty.

1 files changed, 2 insertions, 2 deletions

diff --git a/spec/unit/provider/package/chocolatey_spec.rb b/spec/unit/provider/package/chocolatey_spec.rb
index f8df129c6e..1770869ccd 100644
--- a/spec/unit/provider/package/chocolatey_spec.rb
+++ b/spec/unit/provider/package/chocolatey_spec.rb
@@ -76,13 +76,13 @@ munin-node|1.6.1.20130823
 
     it "should set the candidate_version to pinned version if available" do
       allow_remote_list(["git"])
-      new_resource.version('2.6.1')
+      new_resource.version("2.6.1")
       expect(provider.candidate_version).to eql(["2.6.1"])
     end
 
     it "should set the candidate_version to nill if pinning to bogus version" do
       allow_remote_list(["git"])
-      new_resource.version('2.5.0')
+      new_resource.version("2.5.0")
       expect(provider.candidate_version).to eql([nil])
     end