MuranoCLI 3.2.0.beta.9 → 3.2.1.pre.beta.3

data/spec/cmd_cors_spec.rb

@@ -14,24 +14,24 @@ RSpec.describe 'murano cors', :cmd, :needs_password do
   include_context 'CI_CMD'
 
   before(:example) do
-    @product_name = rname('corstest')
-    out, err, status = Open3.capture3(capcmd('murano', 'application', 'create', @product_name, '--save'))
+    @application_name = rname('corstest')
+    out, err = murano_command_run(
+      'solution create', '--type', 'application', @application_name, '--save',
+    )
     expect(err).to eq('')
     expect(out.chomp).to match(/^[a-zA-Z0-9]+$/)
-    expect(status.exitstatus).to eq(0)
   end
+
   after(:example) do
-    out, err, status = Open3.capture3(capcmd('murano', 'solution', 'delete', @product_name, '-y'))
+    out, err = murano_command_run('solution delete', @application_name, '-y')
     expect(out).to eq('')
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
   end
 
   it 'show CORS' do
-    out, err, status = Open3.capture3(capcmd('murano', 'cors', '-c', 'outformat=json'))
+    out, err = murano_command_run('cors', '-c', 'outformat=json')
     expect { JSON.parse(out) }.to_not raise_error
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
   end
 
   it 'sets CORS' do
@@ -39,17 +39,14 @@ RSpec.describe 'murano cors', :cmd, :needs_password do
       io << { origin: ['http://localhost:*'] }.to_json
     end
 
-    out, err, status = Open3.capture3(capcmd('murano', 'cors', 'set', 'cors.yaml'))
+    out, err = murano_command_run('cors set', 'cors.yaml')
     expect(out).to eq('')
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
 
-    out, err, status = Open3.capture3(capcmd('murano', 'cors', '-c', 'outformat=json'))
+    out, err = murano_command_run('cors', '-c', 'outformat=json')
     expect { out = JSON.parse(out) }.to_not raise_error
     expect(out).to include('origin' => contain_exactly('http://localhost:*'))
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
   end
 end
 
-#  vim: set ai et sw=2 ts=2 :

data/spec/cmd_device_spec.rb

@@ -14,25 +14,27 @@ RSpec.describe 'murano device', :cmd, :needs_password do
 
   before(:example) do
     @product_name = rname('deviceTest')
-    out, err, status = Open3.capture3(capcmd('murano', 'product', 'create', @product_name, '--save'))
+    out, err = murano_command_run(
+      'solution create', '--type', 'product', @product_name, '--save',
+    )
     expect(err).to eq('')
     expect(out.chomp).to match(/^[a-zA-Z0-9]+$/)
-    expect(status.exitstatus).to eq(0)
   end
+
   after(:example) do
-    out, err, status = Open3.capture3(capcmd('murano', 'solution', 'delete', '-y', @product_name))
+    out, err = murano_command_run(
+      'solution delete', '-y', @product_name,
+    )
     expect(out).to eq('')
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
   end
 
   it 'enables and lists' do
-    out, err, status = Open3.capture3(capcmd('murano', 'product', 'device', 'enable', '12345'))
+    out, err = murano_command_run('product device enable', '12345')
     expect(out).to eq('')
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
 
-    out, err, status = Open3.capture3(capcmd('murano', 'product', 'device', 'list'))
+    out, err = murano_command_run('product device list')
     expect(err).to eq('')
     olines = out.lines
     expect(olines[0]).to match(/^(\+-+){3}\+$/)
@@ -40,7 +42,6 @@ RSpec.describe 'murano device', :cmd, :needs_password do
     expect(olines[2]).to match(/^(\+-+){3}\+$/)
     expect(olines[3]).to match(/^\| 12345\s+\| whitelisted\s+\| false\s+\|$/)
     expect(olines[4]).to match(/^(\+-+){3}\+$/)
-    expect(status.exitstatus).to eq(0)
   end
 
   it 'enables a batch' do
@@ -51,13 +52,11 @@ RSpec.describe 'murano device', :cmd, :needs_password do
       io << "1236\n"
     end
 
-    out, err, status = Open3.capture3(capcmd('murano', 'product', 'device', 'enable', '--file', 'ids.csv'))
+    out, err = murano_command_run('product device enable', '--file', 'ids.csv')
     expect(out).to eq('')
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
 
-    out, err, status = Open3.capture3(capcmd('murano', 'product', 'device', 'list'))
-    expect(err).to eq('')
+    out, err = murano_command_run('product device list')
     olines = out.lines
     expect(olines[0]).to match(/^(\+-+){3}\+$/)
     expect(olines[1]).to match(/^\| Identifier\s+\| Status\s+\| Online\s+\|$/)
@@ -66,22 +65,17 @@ RSpec.describe 'murano device', :cmd, :needs_password do
     expect(olines[4]).to match(/^\| 1235\s+\| whitelisted\s+\| false\s+\|$/)
     expect(olines[5]).to match(/^\| 1236\s+\| whitelisted\s+\| false\s+\|$/)
     expect(olines[6]).to match(/^(\+-+){3}\+$/)
-    expect(status.exitstatus).to eq(0)
+    expect(err).to eq('')
   end
 
   it 'activates' do
-    out, err, status = Open3.capture3(capcmd('murano', 'product', 'device', 'enable', '12345'))
+    out, err = murano_command_run('product device enable', '12345')
     expect(out).to eq('')
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
 
-    out, err, status = Open3.capture3(capcmd('murano', 'product', 'device', 'activate', '12345'))
-    # 2017-06-01: This used to return hex, e.g., /^\h{40}$/, but now returns
-    #   a-zA-Z0-9 (but not \w, which also includes underscore).
-    #expect(out.chomp).to match(/^\h{40}$/)
-    expect(out.chomp).to match(/^[a-zA-Z0-9]{40}$/)
+    out, err = murano_command_run('product device activate', '12345')
+    expect(out.chomp).to match(/^[{}a-zA-Z0-9]{40}$/)
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
   end
 
   it 'writes and reads', :club_10s do
@@ -91,40 +85,33 @@ RSpec.describe 'murano device', :cmd, :needs_password do
       'specs/resources.yaml',
     )
 
-    out, err, status = Open3.capture3(capcmd('murano', 'syncup', '--resources'))
-    expect(out).to eq("Adding item state\nAdding item temperature\nAdding item uptime\nAdding item humidity\nUpdating remote product resources\n")
+    out, err = murano_command_run('syncup', '--resources')
+    expect(out).to eq(
+      "Adding item state\n" +
+      "Adding item temperature\n" +
+      "Adding item uptime\n" +
+      "Adding item humidity\n" +
+      "Updating remote product resources\n"
+    )
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
 
-    out, err, status = Open3.capture3(capcmd('murano', 'product', 'device', 'enable', '12345'))
+    out, err = murano_command_run('product device enable', '12345')
     expect(out).to eq('')
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
 
-    out, err, status = Open3.capture3(capcmd('murano', 'product', 'device', 'activate', '12345'))
+    out, err = murano_command_run('product device activate', '12345')
     # 2017-06-01: This used to return hex, e.g., /^\h{40}$/, but now returns
     #   a-zA-Z0-9 (but not \w, which also includes underscore).
-    expect(out.chomp).to match(/^[a-zA-Z0-9]{40}$/)
+    # 2018-07-18: (lb): Now I'm also seeing curly braces. It might help-
+    #   ful to see the spec. on exactly what the acceptable format is...
+    expect(out.chomp).to match(/^[{}a-zA-Z0-9]{40}$/)
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
-
-#    out, err, status = Open3.capture3(capcmd('murano', 'product', 'device', 'twee', '12345'))
-#    expect(err).to eq('')
-#    olines = out.lines
-#    expect(olines[0]).to match(/^(\+-+){4}\+$/)
-#    expect(olines[1]).to match(/^\|\s+12345\s+activated\s+\|$/)
-#    expect(olines[2]).to match(/^(\+-+){4}\+$/)
-#    expect(olines[3]).to match(/^\| Resource\s+\| Format\s+\| Modified\s+\| Value\s+\|$/)
-#    expect(olines[4]).to match(/^(\+-+){4}\+$/)
-#    expect(olines[-1]).to match(/^(\+-+){4}\+$/)
-#    expect(status.exitstatus).to eq(0)
-
-    out, err, status = Open3.capture3(capcmd('murano', 'product', 'device', 'write', '12345', 'state=42'))
+
+    out, err = murano_command_run('product device write', '12345', 'state=42')
     expect(out).to eq('')
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
 
-    out, err, status = Open3.capture3(capcmd('murano', 'product', 'device', 'read', '12345', 'state'))
+    out, err = murano_command_run('product device read', '12345', 'state')
     #expect(out.strip).to eq('42')
     expect(err).to eq('')
     expect(out.lines).to match_array(
@@ -136,7 +123,6 @@ RSpec.describe 'murano device', :cmd, :needs_password do
         /^(\+-+){4}\+$/,
       ]
     )
-    expect(status.exitstatus).to eq(0)
   end
 end
 

data/spec/cmd_domain_spec.rb

@@ -14,29 +14,32 @@ RSpec.describe 'murano domain', :cmd, :needs_password do
 
   before(:example) do
     @product_name = rname('domainTest')
-    out, err, status = Open3.capture3(capcmd('murano', 'product', 'create', @product_name, '--save'))
+    out, err = murano_command_run(
+      'solution create', '--type', 'product', @product_name, '--save',
+    )
     expect(err).to eq('')
     expect(out.chomp).to match(/^[a-zA-Z0-9]+$/)
-    expect(status.exitstatus).to eq(0)
-    out, err, status = Open3.capture3(capcmd('murano', 'application', 'create', @product_name, '--save'))
+
+    @application_name = rname('domainTest')
+    out, err = murano_command_run(
+      'solution create', '--type', 'application', @application_name, '--save',
+    )
     expect(err).to eq('')
     expect(out.chomp).to match(/^[a-zA-Z0-9]+$/)
-    expect(status.exitstatus).to eq(0)
   end
 
   after(:example) do
-    out, err, status = Open3.capture3(capcmd('murano', 'product', 'delete', @product_name, '-y'))
+    out, err = murano_command_run('product delete', @product_name, '-y')
     expect(out).to eq('')
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
-    out, err, status = Open3.capture3(capcmd('murano', 'application', 'delete', @product_name, '--yes'))
+
+    out, err = murano_command_run('application delete', @application_name, '--yes')
     expect(out).to eq('')
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
   end
 
   it 'show domain', :club_20s, :club_10s do
-    out, err, status = Open3.capture3(capcmd('murano', 'domain'))
+    out, err = murano_command_run('domain')
     # 2017-05-31: Previously, the project could be named whatever and
     #   the URI would start with the same.
     #     expect(out.chomp).to start_with("#{@product_name.downcase}.apps.exosite").and end_with('.io')
@@ -50,7 +53,6 @@ RSpec.describe 'murano domain', :cmd, :needs_password do
       )
     end
     expect(err).to eq('')
-    expect(status.exitstatus).to eq(0)
   end
 end
 

data/spec/cmd_element_spec.rb

@@ -68,21 +68,21 @@ RSpec.describe 'murano element', :cmd, :needs_password do
 
     it 'as default-table' do
       # FIXME/2018-04-30: Make test-specific elements for this test!
-      stdout, stderr = murano_command_run('element show', 'MUR-6407')
+      stdout, stderr = murano_command_run('element show', 'Security as a Culture')
       expect_exchange_element_table(stdout, stderr, num_cols: 2)
       expect(stderr).to eq('')
     end
 
     it 'as table wrap' do
       # FIXME/2018-04-30: Make test-specific elements for this test!
-      stdout, stderr = murano_command_run('element show', 'MUR-6407', '--wrap')
+      stdout, stderr = murano_command_run('element show', 'Security as a Culture', '--wrap')
       expect_exchange_element_table(stdout, stderr, num_cols: 2)
       expect(stderr).to eq('')
     end
 
     it 'as table truncate' do
       # FIXME/2018-04-30: Make test-specific elements for this test!
-      stdout, stderr = murano_command_run('element show', 'MUR-6407', '--truncate')
+      stdout, stderr = murano_command_run('element show', 'Security as a Culture', '--truncate')
       expect_exchange_element_table(stdout, stderr, num_cols: 2)
       expect(stderr).to eq('')
     end
@@ -90,7 +90,7 @@ RSpec.describe 'murano element', :cmd, :needs_password do
     # (lb): NOTE: This does not add any additional coverage to element.rb:
     it 'as json' do
       # FIXME/2018-04-30: Make test-specific elements for this test!
-      stdout, stderr = murano_command_run('element show', '--json', 'MUR-6407')
+      stdout, stderr = murano_command_run('element show', '--json', 'Security as a Culture')
       expect { JSON.parse(stdout) }.to_not raise_error
       expect(stderr).to eq('')
     end
@@ -98,7 +98,7 @@ RSpec.describe 'murano element', :cmd, :needs_password do
     # (lb): NOTE: This does not add any additional coverage to element.rb:
     it 'as yaml' do
       # FIXME/2018-04-30: Make test-specific elements for this test!
-      stdout, stderr = murano_command_run('element show', 'MUR-6407', '--yaml')
+      stdout, stderr = murano_command_run('element show', 'Security as a Culture', '--yaml')
       expect { YAML.parse(stdout) }.to_not raise_error
       expect(stderr).to eq('')
     end
@@ -106,13 +106,14 @@ RSpec.describe 'murano element', :cmd, :needs_password do
     # (lb): This adds 1 line of coverage.
     it 'as csv' do
       # FIXME/2018-04-30: Make test-specific elements for this test!
-      stdout, stderr = murano_command_run('element show', 'MUR-6407', '--csv')
+      stdout, stderr = murano_command_run('element show', 'Security as a Culture', '--csv')
       expect(stdout).to_not eq('')
       expect(stderr).to eq('')
     end
   end
 
-  context 'edit' do
+  # FIXME/2018-07-12: (lb): Make test acct. with element. 'til then: disabled.
+  context 'edit', :needs_exchange_element do
     before(:example) do
       @json_input_file = 'element-show.json'
       @spec_swagger_20k = 'swagger-mur-6407__20k.yaml'
@@ -160,16 +161,6 @@ RSpec.describe 'murano element', :cmd, :needs_password do
       end
     end
 
-# DEL:
-    def element_editor_expect_edit_json_from_string
-      expect(TTY::Editor).to receive(:open) do |path|
-        pname = path.is_a?(Pathname) && path || Pathname.new(path)
-        pname.write(
-          %({"tiers":[],"bizid":"55cop31gs89","access":"private","attachment":{},"contact":"#{rname}","description":"For testing Murano CLI element-edit.\\n\\nTEST2222\\n\\nTEST MORE","image":{"detail":{"color":"#224123","filename":"","url":""},"thumbnail":{"color":"#224655","filename":"xxx","url":""}},"markdown":"AxxxxAA2333BBBCCC\\n","name":"MUR-6407 Test Element","source":{"from":"service","name":"mur6407testelement","url":"https://testtesttest.apps.exosite-dev.io/swagger-mur-6407.yaml"},"specs":"","type":"service","tags":[],"active":true,"approval":"approved","elementId":"5ae3600e313d01708c2a6e0f"})
-        )
-      end
-    end
-
     it '--help' do
       stdout, stderr = murano_command_wont_parse('element edit', '--help')
       expect(stdout).to a_string_starting_with('Usage:')
@@ -396,5 +387,15 @@ RSpec.describe 'murano element', :cmd, :needs_password do
       expect(stderr).to eq %(Request Failed: 400: [400] "tiers" is not allowed. "approval" is not allowed\n)
     end
   end
+
+  context 'edit unknown' do
+    it 'as unknown element' do
+      stdout, stderr = murano_command_exits(
+        'element edit', '-e', '', 'BLAH-BLAH-BLAH-NO-NAME-MATCH'
+      )
+      expect(stdout).to eq('')
+      expect(stderr).to eq %(No matching element was found.\n)
+    end
+  end
 end
 

data/spec/cmd_exchange_spec.rb

@@ -21,9 +21,6 @@ RSpec.describe 'murano exchange', :cmd, :needs_password do
   end
 
   context 'with project' do
-    #before(:example) { project_up }
-    #after(:example) { project_down }
-
     def expect_exchange_element_table(stdout, stderr, num_cols: nil)
       expect(stderr).to eq('')
       lines = stdout.lines
@@ -96,7 +93,7 @@ RSpec.describe 'murano exchange', :cmd, :needs_password do
           stdout, stderr = murano_command_exits('exchange purchase', 'IoT')
           expect(stdout).to eq('')
           expect(stderr).to a_string_starting_with(
-            'Please be more specific: More than one matching element was found: '
+            "Please be more specific: More than one matching element was found:\n "
           )
         end
 

data/spec/cmd_init_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe 'murano init', :cmd do
   include_context 'CI_CMD'
 
   def expected_response_when_ids_found_in_config(
-    t,
+    test,
     expect_rebasing: false,
     has_one_each_soln: false,
     has_no_solutions: false,
@@ -29,18 +29,18 @@ RSpec.describe 'murano init', :cmd do
     ]
     if !expect_rebasing
       expecting += [
-        t.a_string_starting_with('Creating project at '), # 1
+        test.a_string_starting_with('Creating project at '), # 1
       ]
     else
       expecting += [
-        t.a_string_starting_with('Rebasing project at '), # 1
+        test.a_string_starting_with('Rebasing project at '), # 1
       ]
     end
     expecting += [
       "\n", # 2
-      t.a_string_starting_with('Found User '), # 3
+      test.a_string_starting_with('Found User '), # 3
       "\n", # 4
-      t.a_string_starting_with('Found Business '), # 5
+      test.a_string_starting_with('Found Business '), # 5
       "\n", # 6
     ]
     if has_one_each_soln
@@ -65,16 +65,16 @@ RSpec.describe 'murano init', :cmd do
       ]
     else
       expecting += [
-        t.a_string_starting_with('Found Application '), # 7
+        test.a_string_starting_with('Found Application '), # 7
         "\n", # 8
-        t.a_string_starting_with('Found Product '), # 9
+        test.a_string_starting_with('Found Product '), # 9
         "\n", # 10
       ]
     end
     expecting += [
-      t.a_string_matching(/Linked '\w+' to '\w+'\n/),
+      test.a_string_matching(/Linked '\w+' to '\w+'\n/),
       "\n",
-      t.a_string_matching(/Created default event handler\n/),
+      test.a_string_matching(/Created default event handler\n/),
       "\n",
     ]
     if expect_proj_file_write
@@ -108,34 +108,26 @@ RSpec.describe 'murano init', :cmd do
       ]
     end
 
-    # 2017-12-15: Currently:
-    #   services{product.id}_event.lua
-    #   services/user_account.lua
-    #   specs/resources.yaml
-    # 2018-04-11: Currently:
+    # 2018-07-23: Currently:
     #   "Updating local product resources\n",
-    #   "Adding item config_service\n",
-    #   "Adding item config_status\n",
     #   "Adding item user_account\n",
     #   "Adding item g3vm2aa9xjfy00000_event\n",
-    #   "Adding item config_service\n",
-    #   "Adding item config_status\n",
-    #   "Synced 7 items\n",
+    #   "Synced 3 items\n",
     expecting += [
       "Updating local product resources\n",
     ]
-    6.times { expecting += [t.a_string_starting_with('Adding item ')] }
+    2.times { expecting += [test.a_string_starting_with('Adding item ')] }
     expecting += [
-      "Synced 7 items\n",
+      "Synced 3 items\n",
       "\n",
     ]
 
     expecting += [
       "Success!\n",
       "\n",
-      t.a_string_matching(/\s+Business ID: \w+\n/),
-      t.a_string_matching(/(\s+Application ID: \w+\n)?/),
-      t.a_string_matching(/(\s+Product ID: \w+\n)?/),
+      test.a_string_matching(/\s+Business ID: \w+\n/),
+      test.a_string_matching(/(\s+Application ID: \w+\n)?/),
+      test.a_string_matching(/(\s+Product ID: \w+\n)?/),
       "\n",
     ]
     expecting
@@ -144,10 +136,9 @@ RSpec.describe 'murano init', :cmd do
   it %(Won't init in HOME (gracefully)) do
     # this is in the project dir. Want to be in HOME
     Dir.chdir(ENV['HOME']) do
-      out, err, status = Open3.capture3(capcmd('murano', 'init'))
+      out, err = murano_command_exits('init')
       expect(out).to eq('')
-      expect(err).to eq("\e[31mCannot init a project in your HOME directory.\e[0m\n")
-      expect(status.exitstatus).to eq(2)
+      expect(err).to eq("Cannot init a project in your HOME directory.\n")
     end
   end
 
@@ -160,45 +151,41 @@ RSpec.describe 'murano init', :cmd do
         murano_solutions_expunge_yes
 
         @applctn_name = rname('initEmptyApp')
-        out, err, status = Open3.capture3(
-          capcmd('murano', 'application', 'create', @applctn_name, '--save')
+        out, err = murano_command_run(
+          'solution create', '--type', 'application', @applctn_name, '--save',
         )
         expect(err).to eq('')
         expect(out.chomp).to match(/^[a-zA-Z0-9]+$/)
-        expect(status.exitstatus).to eq(0)
 
         @product_name = rname('initEmptyPrd')
-        out, err, status = Open3.capture3(
-          capcmd('murano', 'product', 'create', @product_name, '--save')
+        out, err = murano_command_run(
+          'solution create', '--type', 'product', @product_name, '--save',
         )
         expect(err).to eq('')
         expect(out.chomp).to match(/^[a-zA-Z0-9]+$/)
-        expect(status.exitstatus).to eq(0)
 
         # delete all of this so it is a empty directory.
         FileUtils.remove_entry('.murano')
       end
 
       after(:example) do
-        out, err, status = Open3.capture3(
-          capcmd('murano', 'solution', 'delete', @product_name, '-y')
+        out, err = murano_command_run(
+          'solution delete', @product_name, '-y',
         )
         expect(out).to eq('')
         expect(err).to eq('')
-        expect(status.exitstatus).to eq(0)
 
-        out, err, status = Open3.capture3(
-          capcmd('murano', 'solution', 'delete', @applctn_name, '-y')
+        out, err = murano_command_run(
+          'solution delete', @applctn_name, '-y',
         )
         expect(out).to eq('')
         expect(err).to eq('')
-        expect(status.exitstatus).to eq(0)
       end
 
       it 'existing project', :club_20s, :club_10s do
         # The test account will have one business, one product, and one application.
         # So it won't ask any questions.
-        out, err, status = Open3.capture3(capcmd('murano', 'init'))
+        out, err = murano_command_run('init')
         expecting = expected_response_when_ids_found_in_config(
           self,
           has_one_each_soln: true,
@@ -206,13 +193,14 @@ RSpec.describe 'murano init', :cmd do
         out_lines = out.lines.map { |line| strip_fancy(line) }
         expect(out_lines).to match_array(expecting)
         expect(err).to eq('')
-        expect(status.exitstatus).to eq(0)
 
         expect(File.directory?('.murano')).to be true
         expect(File.exist?('.murano/config')).to be true
-        expect(File.directory?('routes')).to be true
+        expect(File.directory?('routes')).to be false
+        expect(File.directory?('endpoints')).to be true
         expect(File.directory?('services')).to be true
-        expect(File.directory?('files')).to be true
+        expect(File.directory?('files')).to be false
+        expect(File.directory?('assets')).to be true
         expect(File.directory?('modules')).to be true
         expect(File.directory?('specs')).to be true
       end
@@ -225,19 +213,17 @@ RSpec.describe 'murano init', :cmd do
         @product_name = rname('initCreatingPrd')
       end
       after(:example) do
-        out, err, status = Open3.capture3(
-          capcmd('murano', 'solution', 'delete', @product_name, '-y')
+        out, err = murano_command_run(
+          'solution delete', @product_name, '-y',
         )
         expect(out).to eq('')
         expect(err).to eq('')
-        expect(status.exitstatus).to eq(0)
 
-        out, err, status = Open3.capture3(
-          capcmd('murano', 'solution', 'delete', @applctn_name, '-y')
+        out, err = murano_command_run(
+          'solution delete', @applctn_name, '-y',
         )
         expect(out).to eq('')
         expect(err).to eq('')
-        expect(status.exitstatus).to eq(0)
       end
 
       it 'existing project', :club_20s, :club_10s do
@@ -250,6 +236,7 @@ RSpec.describe 'murano init', :cmd do
         #{@product_name}
         DATA
         # 2017-07-05: [lb] added line numbers to use debugger to help maintain this test.
+        # FIXME/2018-07-26: (lb): Use murano_command_run here? What about stdin_date?
         out, err, status = Open3.capture3(capcmd('murano', 'init'), stdin_data: data)
         expecting = expected_response_when_ids_found_in_config(
           self,
@@ -296,9 +283,11 @@ RSpec.describe 'murano init', :cmd do
 
         expect(File.directory?('.murano')).to be true
         expect(File.exist?('.murano/config')).to be true
-        expect(File.directory?('routes')).to be true
+        expect(File.directory?('routes')).to be false
+        expect(File.directory?('endpoints')).to be true
         expect(File.directory?('services')).to be true
-        expect(File.directory?('files')).to be true
+        expect(File.directory?('files')).to be false
+        expect(File.directory?('assets')).to be true
         expect(File.directory?('modules')).to be true
         expect(File.directory?('specs')).to be true
       end
@@ -313,40 +302,36 @@ RSpec.describe 'murano init', :cmd do
       FileUtils.move('assets', 'files')
 
       @applctn_name = rname('initEmptyApp')
-      out, err, status = Open3.capture3(
-        capcmd('murano', 'application', 'create', @applctn_name, '--save')
+      out, err = murano_command_run(
+        'solution create', '--type', 'application', @applctn_name, '--save',
       )
       expect(err).to eq('')
       expect(out.chomp).to match(/^[a-zA-Z0-9]+$/)
-      expect(status.exitstatus).to eq(0)
 
       @product_name = rname('initEmptyPrd')
-      out, err, status = Open3.capture3(
-        capcmd('murano', 'product', 'create', @product_name, '--save')
+      out, err = murano_command_run(
+        'solution create', '--type', 'product', @product_name, '--save',
       )
       expect(err).to eq('')
       expect(out.chomp).to match(/^[a-zA-Z0-9]+$/)
-      expect(status.exitstatus).to eq(0)
     end
 
     after(:example) do
       Dir.chdir(ENV['HOME']) do
         if defined?(@product_name)
-          out, err, status = Open3.capture3(
-            capcmd('murano', 'solution', 'delete', @product_name, '-y')
+          out, err = murano_command_run(
+            'solution delete', @product_name, '-y',
           )
           expect(out).to eq('')
           expect(err).to eq('')
-          expect(status.exitstatus).to eq(0)
         end
 
         if defined?(@applctn_name)
-          out, err, status = Open3.capture3(
-            capcmd('murano', 'solution', 'delete', @applctn_name, '-y')
+          out, err = murano_command_run(
+            'solution delete', @applctn_name, '-y',
           )
           expect(out).to eq('')
           expect(err).to eq('')
-          expect(status.exitstatus).to eq(0)
         end
       end
     end
@@ -354,7 +339,7 @@ RSpec.describe 'murano init', :cmd do
     it 'without ProjectFile', :club_20s, :club_10s do
       # The test account will have one business, one product, and one application.
       # So it won't ask any questions.
-      out, err, status = Open3.capture3(capcmd('murano', 'init'))
+      out, err = murano_command_run('init')
       the_expected = expected_response_when_ids_found_in_config(
         self,
         expect_rebasing: true,
@@ -363,7 +348,6 @@ RSpec.describe 'murano init', :cmd do
       out_lines = out.lines.map { |line| strip_fancy(line) }
       expect(out_lines).to match_array(the_expected)
       expect(err).to eq('')
-      expect(status.exitstatus).to eq(0)
 
       expect(File.directory?('.murano')).to be true
       expect(File.exist?('.murano/config')).to be true
@@ -375,10 +359,13 @@ RSpec.describe 'murano init', :cmd do
     end
 
     it 'with ProjectFile', :club_20s, :club_10s do
-      FileUtils.copy(File.join(@testdir, 'spec/fixtures/ProjectFiles/only_meta.yaml'), 'test.murano')
+      FileUtils.copy(
+        File.join(@testdir, 'spec/fixtures/ProjectFiles/only_meta.yaml',),
+        'test.murano',
+      )
       # The test account will have one business, one product, and one application.
       # So it won't ask any questions.
-      out, err, status = Open3.capture3(capcmd('murano', 'init'))
+      out, err = murano_command_run('init')
       expected = expected_response_when_ids_found_in_config(
         self,
         expect_rebasing: true,
@@ -388,7 +375,6 @@ RSpec.describe 'murano init', :cmd do
       out_lines = out.lines.map { |line| strip_fancy(line) }
       expect(out_lines).to match_array(expected)
       expect(err).to eq('')
-      expect(status.exitstatus).to eq(0)
 
       expect(File.directory?('.murano')).to be true
       expect(File.exist?('.murano/config')).to be true
@@ -419,7 +405,7 @@ RSpec.describe 'murano init', :cmd do
       # So it won't ask any questions.
       # NOTE: This tests uses an old Solutionfile.json, config v0.2.0, and it
       # downloads Lua scripts to the root of the project directory. Just FYI.
-      out, err, status = Open3.capture3(capcmd('murano', 'init'))
+      out, err = murano_command_run('init')
       expected = expected_response_when_ids_found_in_config(
         self,
         expect_rebasing: true,
@@ -428,7 +414,6 @@ RSpec.describe 'murano init', :cmd do
       out_lines = out.lines.map { |line| strip_fancy(line) }
       expect(out_lines).to match_array(expected)
       expect(err).to eq('')
-      expect(status.exitstatus).to eq(0)
 
       expect(File.directory?('.murano')).to be true
       expect(File.exist?('.murano/config')).to be true
@@ -458,7 +443,7 @@ RSpec.describe 'murano init', :cmd do
       end
       # The test account will have one business, one product, and one application.
       # So it won't ask any questions.
-      out, err, status = Open3.capture3(capcmd('murano', 'init'))
+      out, err = murano_command_run('init')
       expected = expected_response_when_ids_found_in_config(
         self,
         expect_rebasing: true,
@@ -467,7 +452,6 @@ RSpec.describe 'murano init', :cmd do
       out_lines = out.lines.map { |line| strip_fancy(line) }
       expect(out_lines).to match_array(expected)
       expect(err).to eq('')
-      expect(status.exitstatus).to eq(0)
 
       expect(File.directory?('.murano')).to be true
       expect(File.exist?('.murano/config')).to be true