(CONT-228) Update acceptance tests

This commit updates the acceptance tests to reflect the removals in the
previous commit.

Author: chelnak

spec/acceptance/emit_json_options_spec.rb renamed to spec/acceptance/generate_json_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper_acceptance'
 
-describe 'Emitting JSON' do
+describe 'Generating JSON' do
   let(:test_module_path) do
     sut_module_path(%r{Module test})
   end
@@ -50,26 +50,14 @@
     }
   end
 
-  [
-    { title: '--format json and STDOUT', cmd_line: '--format json' },
-    { title: '--emit-json-stdout', cmd_line: '--emit-json-stdout' },
-  ].each do |testcase|
-    it "emits JSON to stdout when using #{testcase[:title]}" do
-      output = run_shell("puppet strings generate #{testcase[:cmd_line]} \"#{test_module_path}/lib/puppet/parser/functions/function3x.rb\"").stdout.chomp
-      expect(JSON.parse(output)).to eq(expected)
-    end
+  it 'renders JSON to stdout when using --format json' do
+    output = run_shell("puppet strings generate --format json \"#{test_module_path}/lib/puppet/parser/functions/function3x.rb\"").stdout.chomp
+    expect(JSON.parse(output)).to eq(expected)
   end
 
-  [
-    { title: '--format json and --out', cmd_line: '--format json --out "TMPFILE"' },
-    { title: '--emit-json', cmd_line: '--emit-json "TMPFILE"' },
-  ].each do |testcase|
-    it "writes JSON to a file when using #{testcase[:title]}" do
-      tmpfile = File.join(remote_tmp_path, 'json_output.json')
-      cmd = "puppet strings generate #{testcase[:cmd_line].gsub('TMPFILE', tmpfile)} \"#{test_module_path}/lib/puppet/parser/functions/function3x.rb\""
-      run_shell(cmd)
-      output = JSON.parse(file(tmpfile).content)
-      expect(output).to eq(expected)
-    end
+  it 'writes JSON to a file when using --format json --out' do
+    tmpfile = File.join(remote_tmp_path, 'json_output.json')
+    run_shell("puppet strings generate --format json --out #{tmpfile} \"#{test_module_path}/lib/puppet/parser/functions/function3x.rb\"")
+    expect(JSON.parse(file(tmpfile).content)).to eq(expected)
   end
 end