Merge pull request #568 from ftnk/simplify_content_as_json

[Refactoring] Simplify Serverspec::Type::File#content_as_json with #content
mizzy · May 15, 2016 · 5404e89 · 5404e89
2 parents 30dbe41 + 0fe8c2d
commit 5404e89
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/lib/serverspec/type/file.rb b/lib/serverspec/type/file.rb
@@ -115,10 +115,7 @@ def content
     end
 
     def content_as_json
-      if @content_as_json.nil?
-        @content = @runner.get_file_content(@name).stdout if @content.nil?
-        @content_as_json = MultiJson.load(@content)
-      end
+      @content_as_json = MultiJson.load(content) if @content_as_json.nil?
       @content_as_json
     end