Change rspec generated expectations to match minitest

piotrmurach · May 23, 2018 · b2e7958 · b2e7958
1 parent 7db447a
commit b2e7958
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 9 deletions.
diff --git a/lib/tty/templates/add/spec/integration/command_spec.rb.tt b/lib/tty/templates/add/spec/integration/command_spec.rb.tt
@@ -1,7 +1,7 @@
 RSpec.describe "`<%= "#{app_name_underscored} #{cmd_name_underscored}" %>` command", type: :cli do
   it "executes `<%= "#{app_name_underscored} help #{cmd_name_underscored}" %>` command successfully" do
     output = `<%= "#{app_name_underscored} help #{cmd_name_underscored}" %>`
-    expect(output).to eq <<-OUT
+    expected_output = <<-OUT
     <%- if subcmd_name_underscored.to_s.empty? -%>
 Usage:
   <%= app_name_underscored + ' ' + cmd_name_underscored + cmd_desc_args %>
@@ -14,5 +14,7 @@ Options:
 Commands:
     <%- end -%>
     OUT
+
+    expect(output).to eq(expected_output)
   end
 end
diff --git a/lib/tty/templates/add/spec/integration/sub_command_spec.rb.tt b/lib/tty/templates/add/spec/integration/sub_command_spec.rb.tt
@@ -1,7 +1,7 @@
 RSpec.describe "`<%= "#{app_name_underscored} #{cmd_name_underscored} #{subcmd_name_underscored}" %>` command", type: :cli do
   it "executes `<%= "#{app_name_underscored} #{cmd_name_underscored} help #{subcmd_name_underscored}" %>` command successfully" do
     output = `<%= "#{app_name_underscored} #{cmd_name_underscored} help #{subcmd_name_underscored}" %>`
-    expect(output).to eq <<-OUT
+    expected_output = <<-OUT
 Usage:
   <%= app_name_underscored + ' ' + subcmd_name_underscored + cmd_desc_args %>
 
@@ -10,5 +10,7 @@ Options:
 
 <%= cmd_desc %>
     OUT
+
+    expect(output).to eq(expected_output)
   end
 end
diff --git a/spec/integration/add_desc_args_spec.rb b/spec/integration/add_desc_args_spec.rb
@@ -84,7 +84,7 @@ def execute(input: $stdin, output: $stdout)
 RSpec.describe "`newcli config` command", type: :cli do
   it "executes `newcli help config` command successfully" do
     output = `newcli help config`
-    expect(output).to eq <<-OUT
+    expected_output = <<-OUT
 Usage:
   newcli config ARG1 ARG2
 
@@ -93,6 +93,8 @@ def execute(input: $stdin, output: $stdout)
 
 Set and get configuration option
     OUT
+
+    expect(output).to eq(expected_output)
   end
 end
       EOS

diff --git a/spec/integration/add_namespaced_spec.rb b/spec/integration/add_namespaced_spec.rb
@@ -91,7 +91,7 @@ def server(*)
 RSpec.describe "`cli-app server` command", type: :cli do
   it "executes `cli-app help server` command successfully" do
     output = `cli-app help server`
-    expect(output).to eq <<-OUT
+    expected_output = <<-OUT
 Usage:
   cli-app server
 
@@ -100,6 +100,8 @@ def server(*)
 
 Command description...
     OUT
+
+    expect(output).to eq(expected_output)
   end
 end
       EOS
@@ -241,9 +243,11 @@ def execute(input: $stdin, output: $stdout)
 RSpec.describe "`cli-app config` command", type: :cli do
   it "executes `cli-app help config` command successfully" do
     output = `cli-app help config`
-    expect(output).to eq <<-OUT
+    expected_output = <<-OUT
 Commands:
     OUT
+
+    expect(output).to eq(expected_output)
   end
 end
       EOS
@@ -252,7 +256,7 @@ def execute(input: $stdin, output: $stdout)
 RSpec.describe "`cli-app config set` command", type: :cli do
   it "executes `cli-app config help set` command successfully" do
     output = `cli-app config help set`
-    expect(output).to eq <<-OUT
+    expected_output = <<-OUT
 Usage:
   cli-app set
 
@@ -261,6 +265,8 @@ def execute(input: $stdin, output: $stdout)
 
 Command description...
     OUT
+
+    expect(output).to eq(expected_output)
   end
 end
       EOS

diff --git a/spec/integration/add_spec.rb b/spec/integration/add_spec.rb
@@ -85,7 +85,7 @@ def server(*)
 RSpec.describe "`newcli server` command", type: :cli do
   it "executes `newcli help server` command successfully" do
     output = `newcli help server`
-    expect(output).to eq <<-OUT
+    expected_output = <<-OUT
 Usage:
   newcli server
 
@@ -94,6 +94,8 @@ def server(*)
 
 Command description...
     OUT
+
+    expect(output).to eq(expected_output)
   end
 end
       EOS

diff --git a/spec/integration/add_subcommand_spec.rb b/spec/integration/add_subcommand_spec.rb
@@ -108,9 +108,11 @@ def execute(input: $stdin, output: $stdout)
 RSpec.describe "`newcli config` command", type: :cli do
   it "executes `newcli help config` command successfully" do
     output = `newcli help config`
-    expect(output).to eq <<-OUT
+    expected_output = <<-OUT
 Commands:
     OUT
+
+    expect(output).to eq(expected_output)
   end
 end
       EOS
@@ -121,7 +123,7 @@ def execute(input: $stdin, output: $stdout)
 RSpec.describe "`newcli config set` command", type: :cli do
   it "executes `newcli config help set` command successfully" do
     output = `newcli config help set`
-    expect(output).to eq <<-OUT
+    expected_output = <<-OUT
 Usage:
   newcli set
 
@@ -130,6 +132,8 @@ def execute(input: $stdin, output: $stdout)
 
 Command description...
     OUT
+
+    expect(output).to eq(expected_output)
   end
 end
       EOS