Review fixes - reorgonize spec

spec/command/base_spec.rb

@@ -12,9 +12,10 @@
 
   describe "#step" do
     let(:message) { "test message" }
+    let(:common_options) { { abort_on_error: false } }
 
     context "with retry_on_failure: true" do
-      let(:options) { { retry_on_failure: true, wait: 0 } }
+      let(:options) { common_options.merge(retry_on_failure: true, wait: 0) }
 
       it "retries block until success" do
         run_count = 0
@@ -28,7 +29,7 @@
       end
 
       context "with max_retry_count option" do
-        let(:options) { super().merge(max_retry_count: 1) }
+        let(:options) { common_options.merge(retry_on_failure: true, wait: 0, max_retry_count: 1) }
 
         it "retries block specified times" do
           run_count = 0
@@ -44,7 +45,7 @@
     end
 
     context "with retry_on_failure: false" do
-      let(:options) { { retry_on_failure: false } }
+      let(:options) { common_options.merge(retry_on_failure: false) }
 
       it "does not retry block" do
         run_count = 0