MuranoCLI 2.2.4 → 3.0.0

data/spec/cmd_status_spec.rb

@@ -1,42 +1,154 @@
+# Last Modified: 2017.08.17 /coding: utf-8
+# frozen_string_literal: probably not yet
+
+# Copyright © 2016-2017 Exosite LLC.
+# License: MIT. See LICENSE.txt.
+#  vim:tw=0:ts=2:sw=2:et:ai
+
 require 'fileutils'
+require 'json'
 require 'open3'
 require 'pathname'
-require 'json'
+require 'rbconfig'
+
 require 'cmd_common'
 
 RSpec.describe 'murano status', :cmd, :needs_password do
   include_context "CI_CMD"
 
   before(:example) do
-    @project_name = rname('statusTest')
-    out, err, status = Open3.capture3(capcmd('murano', 'solution', 'create', @project_name, '--save'))
+    @product_name = rname('statusTest')
+    out, err, status = Open3.capture3(capcmd('murano', 'product', 'create', @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', 'product', 'create', @project_name, '--save'))
+    @applctn_name = rname('statusTest')
+    out, err, status = Open3.capture3(capcmd('murano', 'application', 'create', @applctn_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', 'assign', 'set'))
+    #olines = out.lines
+    #expect(olines[0]).to eq("Linked ‘#{@product_name}’ to ‘#{@applctn_name}’\n")
+    #expect(olines[1]).to eq("Created default event handler\n")
+    #expect(err).to eq('')
+    #expect(status.exitstatus).to eq(0)
+
+    out, err, status = Open3.capture3(
+      #capcmd('murano', 'syncdown', '--eventhandlers', '--no-delete', '--no-update')
+      capcmd('murano', 'syncdown', '--eventhandlers', '--no-delete', '--no-create')
+    )
+    # E.g.,
+    #  "Adding item timer_timer\nAdding item tsdb_exportJob\nAdding item user_account\n"
+    olines = out.lines
+    # 2017-08-08: Because of eventhandler.undeletable, the boilerplate items
+    #   pre-exist, in a sense, and are therefore described as being updated,
+    #   not added.
+    (0..2).each do |ln|
+      #expect(olines[ln].to_s).to a_string_starting_with("Adding item ")
+      expect(olines[ln].to_s).to a_string_starting_with("Updating item ")
+    end
+
+    expect(err).to eq('')
+    expect(status.exitstatus).to eq(0)
   end
+
   after(:example) do
-    out, err, status = Open3.capture3(capcmd('murano', 'solution', 'delete', @project_name))
+    out, err, status = Open3.capture3(capcmd('murano', 'solution', 'delete', @applctn_name, '-y'))
     expect(out).to eq('')
     expect(err).to eq('')
     expect(status.exitstatus).to eq(0)
 
-    out, err, status = Open3.capture3(capcmd('murano', 'product', 'delete', @project_name))
+    out, err, status = Open3.capture3(capcmd('murano', 'solution', 'delete', @product_name, '-y'))
     expect(out).to eq('')
     expect(err).to eq('')
     expect(status.exitstatus).to eq(0)
   end
 
+  def match_syncable_contents(slice)
+      expect(slice).to include(
+        a_string_matching(/ \+ \w  .*modules\/table_util\.lua/),
+        a_string_matching(/ \+ \w  .*routes\/manyRoutes\.lua/),
+        a_string_matching(/ \+ \w  .*routes\/manyRoutes\.lua:4/),
+        a_string_matching(/ \+ \w  .*routes\/manyRoutes\.lua:7/),
+        # singleRoute only appears in some of the tests.
+        a_string_matching(/ \+ \w  .*routes\/singleRoute\.lua/),
+        a_string_matching(/ \+ \w  .*files\/js\/script\.js/),
+        a_string_matching(/ \+ \w  .*files\/icon\.png/),
+        a_string_matching(/ \+ \w  .*files\/index\.html/),
+      )
+  end
+
+  def match_syncable_contents_resources(slice)
+      expect(slice).to include(
+        a_string_matching(/ \+ \w  state/),
+        a_string_matching(/ \+ \w  temperature/),
+        a_string_matching(/ \+ \w  uptime/),
+        a_string_matching(/ \+ \w  humidity/),
+      )
+  end
+
+  def match_syncable_contents_except_singleRoute(slice)
+      expect(slice).to include(
+        a_string_matching(/ \+ \w  .*modules\/table_util\.lua/),
+        a_string_matching(/ \+ \w  .*routes\/manyRoutes\.lua/),
+        a_string_matching(/ \+ \w  .*routes\/manyRoutes\.lua:4/),
+        a_string_matching(/ \+ \w  .*routes\/manyRoutes\.lua:7/),
+        # singleRoute does not appear in old Solutionfile tests
+        # that don't specify it.
+        #a_string_matching(/ \+ \w  .*routes\/singleRoute\.lua/),
+        a_string_matching(/ \+ \w  .*files\/js\/script\.js/),
+        a_string_matching(/ \+ \w  .*files\/icon\.png/),
+        a_string_matching(/ \+ \w  .*files\/index\.html/),
+      )
+  end
+
+  def match_remote_boilerplate_v1_0_0_service(slice)
+    expect(slice).to include(
+      #a_string_matching(/ - \w  device2_event/),
+      #a_string_matching(/ - \w  interface_addGatewayResource/),
+      #a_string_matching(/ - \w  interface_addIdentity/),
+      #a_string_matching(/ - \w  interface_clearContent/),
+      #a_string_matching(/ - \w  interface_deleteContent/),
+      #a_string_matching(/ - \w  interface_downloadContent/),
+      #a_string_matching(/ - \w  interface_getGatewayResource/),
+      #a_string_matching(/ - \w  interface_getGatewaySettings/),
+      #a_string_matching(/ - \w  interface_getIdentity/),
+      #a_string_matching(/ - \w  interface_getIdentityState/),
+      #a_string_matching(/ - \w  interface_infoContent/),
+      #a_string_matching(/ - \w  interface_listContent/),
+      #a_string_matching(/ - \w  interface_listIdentities/),
+      #a_string_matching(/ - \w  interface_makeIdentity/),
+      #a_string_matching(/ - \w  interface_removeGatewayResource/),
+      #a_string_matching(/ - \w  interface_removeIdentity/),
+      #a_string_matching(/ - \w  interface_setIdentityState/),
+      #a_string_matching(/ - \w  interface_updateGatewayResource/),
+      #a_string_matching(/ - \w  interface_updateGatewaySettings/),
+      #a_string_matching(/ - \w  interface_updateIdentity/),
+      #a_string_matching(/ - \w  interface_uploadContent/),
+      #a_string_matching(/ - \w  timer_timer (Application Event Handlers)/),
+      #a_string_matching(/ - \w  tsdb_exportJob (Application Event Handlers)/),
+      #a_string_matching(/ - \w  user_account (Application Event Handlers)/),
+      #a_string_matching(/ - \w  timer_timer/),
+      #a_string_matching(/ - \w  tsdb_exportJob/),
+      #a_string_matching(/ - \w  user_account/),
+      a_string_matching(/ M \w  timer_timer\.lua/),
+      a_string_matching(/ M \w  tsdb_exportJob\.lua/),
+      a_string_matching(/ M \w  user_account\.lua/),
+    )
+  end
+
   context "without ProjectFile" do
     before(:example) do
       FileUtils.cp_r(File.join(@testdir, 'spec/fixtures/syncable_content/.'), '.')
-      FileUtils.move('assets','files')
+      FileUtils.move('assets', 'files')
       FileUtils.mkpath('specs')
-      FileUtils.copy(File.join(@testdir, 'spec/fixtures/product_spec_files/lightbulb.yaml'), 'specs/resources.yaml')
+      FileUtils.copy(
+        File.join(@testdir, 'spec/fixtures/product_spec_files/lightbulb.yaml'),
+        'specs/resources.yaml',
+      )
     end
 
     it "status" do
@@ -46,27 +158,32 @@ RSpec.describe 'murano status', :cmd, :needs_password do
       # 1: Order of files is not set
       # 2: Path prefixes could be different.
       olines = out.lines
-      expect(olines[0]).to eq("Adding:\n")
-      expect(olines[1..8]).to include(
-        a_string_matching(/ \+ A  .*routes\/manyRoutes\.lua/),
-        a_string_matching(/ \+ A  .*routes\/manyRoutes\.lua:4/),
-        a_string_matching(/ \+ A  .*routes\/manyRoutes\.lua:7/),
-        a_string_matching(/ \+ A  .*routes\/singleRoute\.lua/),
-        a_string_matching(/ \+ S  .*files\/icon\.png/),
-        a_string_matching(/ \+ S  .*files\/index\.html/),
-        a_string_matching(/ \+ S  .*files\/js\/script\.js/),
-        a_string_matching(/ \+ M  .*modules\/table_util\.lua/),
-      )
-      expect(olines[9]).to eq("Deleteing:\n")
-      expect(olines[10..11]).to include(
-        " - M  my_library\n",
-        " - E  user_account\n",
-      )
-      expect(olines[12]).to eq("Changing:\n")
-      expect(olines[13..14]).to include(
-        a_string_matching(/ M E  .*services\/devdata\.lua/),
-        a_string_matching(/ M E  .*services\/timers\.lua/),
-      )
+      expect(olines[0]).to eq("Only on local machine:\n")
+      match_syncable_contents_resources(olines[1..4])
+      match_syncable_contents(olines[5..12])
+      #expect(olines[13]).to eq("Only on remote server:\n")
+      expect(olines[13]).to eq("Nothing new remotely\n")
+      # FIMXE/2017-06-23: We should DRY this long list which is same in each test.
+      # FIXME/2017-06-23: The interfaces the server creates for a new project
+      #   will problem vary depending on what modules are loaded, and are likely
+      #   to change over time...
+      #match_remote_boilerplate_v1_0_0_service(olines[14..35])
+
+      # NOTE: On Windows, touch doesn't work, so items differ.
+      # Check the platform, e.g., "linux-gnu", or other.
+      # 2017-07-14 08:51: Is there a race condition here? [lb] saw
+      # differences earlier, but then not after adding this...
+      #is_windows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
+      #if is_windows
+      #  expect(olines[14]).to eq("Items that differ:\n")
+      #  expect(olines[15..16]).to contain_exactly(
+      #    a_string_matching(/ M \w  .*services\/timer_timer\.lua/),
+      #    a_string_matching(/ M \w  .*services\/tsdb_exportJob\.lua/),
+      #  )
+      #else
+        expect(olines[14]).to eq("Nothing that differs\n")
+      #end
+
       expect(status.exitstatus).to eq(0)
     end
 
@@ -74,10 +191,10 @@ RSpec.describe 'murano status', :cmd, :needs_password do
       out, err, status = Open3.capture3(capcmd('murano', 'status', '**/icon.png'))
       expect(err).to eq('')
       expect(out.lines).to match([
-        "Adding:\n",
-        a_string_matching(/ \+ S  .*files\/icon\.png/),
-        "Deleteing:\n",
-        "Changing:\n",
+        "Only on local machine:\n",
+        a_string_matching(/ \+ \w  .*files\/icon\.png/),
+        "Nothing new remotely\n",
+        "Nothing that differs\n",
       ])
       expect(status.exitstatus).to eq(0)
     end
@@ -86,10 +203,10 @@ RSpec.describe 'murano status', :cmd, :needs_password do
       out, err, status = Open3.capture3(capcmd('murano', 'status', '#put#'))
       expect(err).to eq('')
       expect(out.lines).to match([
-        "Adding:\n",
-        a_string_matching(/ \+ A  .*routes\/manyRoutes\.lua:4/),
-        "Deleteing:\n",
-        "Changing:\n",
+        "Only on local machine:\n",
+        a_string_matching(/ \+ \w  .*routes\/manyRoutes\.lua:4/),
+        "Nothing new remotely\n",
+        "Nothing that differs\n",
       ])
       expect(status.exitstatus).to eq(0)
     end
@@ -97,10 +214,16 @@ RSpec.describe 'murano status', :cmd, :needs_password do
 
   context "with ProjectFile" do
     before(:example) do
+      # We previously called syncdown, which created the project/services/
+      # directory, but don't fret, this copy command will overlay files and
+      # it will not overwrite directories (or do nothing to them, either).
       FileUtils.cp_r(File.join(@testdir, 'spec/fixtures/syncable_content/.'), '.')
-      FileUtils.move('assets','files')
+      FileUtils.move('assets', 'files')
       FileUtils.mkpath('specs')
-      FileUtils.copy(File.join(@testdir, 'spec/fixtures/product_spec_files/lightbulb.yaml'), 'specs/resources.yaml')
+      FileUtils.copy(
+        File.join(@testdir, 'spec/fixtures/product_spec_files/lightbulb.yaml'),
+        'specs/resources.yaml',
+      )
       FileUtils.copy(File.join(@testdir, 'spec/fixtures/ProjectFiles/only_meta.yaml'), 'test.murano')
     end
 
@@ -108,37 +231,36 @@ RSpec.describe 'murano status', :cmd, :needs_password do
       out, err, status = Open3.capture3(capcmd('murano', 'status'))
       expect(err).to eq('')
       olines = out.lines
-      expect(olines[0]).to eq("Adding:\n")
-      expect(olines[1..8]).to include(
-        a_string_matching(/ \+ A  .*routes\/manyRoutes\.lua/),
-        a_string_matching(/ \+ A  .*routes\/manyRoutes\.lua:4/),
-        a_string_matching(/ \+ A  .*routes\/manyRoutes\.lua:7/),
-        a_string_matching(/ \+ A  .*routes\/singleRoute\.lua/),
-        a_string_matching(/ \+ S  .*files\/icon\.png/),
-        a_string_matching(/ \+ S  .*files\/index\.html/),
-        a_string_matching(/ \+ S  .*files\/js\/script\.js/),
-        a_string_matching(/ \+ M  .*modules\/table_util\.lua/),
-      )
-      expect(olines[9]).to eq("Deleteing:\n")
-      expect(olines[10..11]).to include(
-        " - M  my_library\n",
-        " - E  user_account\n",
-      )
-      expect(olines[12]).to eq("Changing:\n")
-      expect(olines[13..14]).to include(
-        a_string_matching(/ M E  .*services\/devdata\.lua/),
-        a_string_matching(/ M E  .*services\/timers\.lua/),
-      )
+      expect(olines[0]).to eq("Only on local machine:\n")
+      match_syncable_contents_resources(olines[1..4])
+      match_syncable_contents(olines[5..12])
+      expect(olines[13]).to eq("Nothing new remotely\n")
+
+      # NOTE: On Windows, touch doesn't work, so items differ.
+      # Check the platform, e.g., "linux-gnu", or other.
+      is_windows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
+      if is_windows
+        expect(olines[14]).to eq("Items that differ:\n")
+        expect(olines[15..16]).to include(
+          a_string_matching(/ M \w  .*services\/timer_timer\.lua/),
+          a_string_matching(/ M \w  .*services\/tsdb_exportJob\.lua/),
+        )
+      else
+        expect(olines[14]).to eq("Nothing that differs\n")
+      end
+
       expect(status.exitstatus).to eq(0)
     end
   end
 
+  # XXX wait, should a Solutionfile even work with Okami?
   context "with Solutionfile 0.2.0" do
     before(:example) do
       FileUtils.cp_r(File.join(@testdir, 'spec/fixtures/syncable_content/.'), '.')
       FileUtils.move('assets','files')
       FileUtils.mkpath('specs')
-      FileUtils.copy(File.join(@testdir, 'spec/fixtures/product_spec_files/lightbulb.yaml'), 'specs/resources.yaml')
+      FileUtils.copy(File.join(@testdir, 'spec/fixtures/product_spec_files/lightbulb.yaml'),
+        'specs/resources.yaml')
       File.open('Solutionfile.json', 'wb') do |io|
         io << {
           :default_page => 'index.html',
@@ -159,83 +281,70 @@ RSpec.describe 'murano status', :cmd, :needs_password do
     it "status" do
       out, err, status = Open3.capture3(capcmd('murano', 'status'))
       expect(err).to eq('')
+      # Not a single match, because the order of items within groups can shift
       olines = out.lines
-      expect(olines[0]).to eq("Adding:\n")
-      expect(olines[1..7]).to include(
-        a_string_matching(/ \+ A  .*routes\/manyRoutes\.lua/),
-        a_string_matching(/ \+ A  .*routes\/manyRoutes\.lua:4/),
-        a_string_matching(/ \+ A  .*routes\/manyRoutes\.lua:7/),
-        a_string_matching(/ \+ S  .*files\/icon\.png/),
-        a_string_matching(/ \+ S  .*files\/index\.html/),
-        a_string_matching(/ \+ S  .*files\/js\/script\.js/),
-        a_string_matching(/ \+ M  .*modules\/table_util\.lua/),
-      )
-      expect(olines[8]).to eq("Deleteing:\n")
-      expect(olines[9..11]).to include(
-        " - M  my_library\n",
-        " - E  user_account\n",
-        " - E  timer_timer\n",
-      )
-      expect(olines[12]).to eq("Changing:\n")
-      expect(olines[13..14]).to include(
-        a_string_matching(/ M E  .*services\/devdata\.lua/),
-      )
+      expect(olines[0]).to eq("Only on local machine:\n")
+      match_syncable_contents_resources(olines[1..4])
+      match_syncable_contents_except_singleRoute(olines[5..11])
+      #expect(olines[12]).to eq("Only on remote server:\n")
+      #match_remote_boilerplate_v1_0_0_service(olines[13..15])
+      expect(olines[12]).to eq("Nothing new remotely\n")
+      #expect(olines[16]).to eq("Nothing that differs\n")
+      ##expect(olines[11]).to eq("Items that differ:\n")
+      ##expect(olines[12..12]).to contain_exactly(
+      ##  a_string_matching(/ M \w  .*services\/devdata\.lua/),
+      ##)
+      expect(olines[13]).to eq("Items that differ:\n")
+      match_remote_boilerplate_v1_0_0_service(olines[14..16])
       expect(status.exitstatus).to eq(0)
     end
   end
 
+  # XXX wait, should a Solutionfile even work with Okami?
   context "with Solutionfile 0.3.0" do
     before(:example) do
       FileUtils.cp_r(File.join(@testdir, 'spec/fixtures/syncable_content/.'), '.')
-      FileUtils.move('assets','files')
+      FileUtils.move('assets', 'files')
       FileUtils.mkpath('specs')
-      FileUtils.copy(File.join(@testdir, 'spec/fixtures/product_spec_files/lightbulb.yaml'), 'specs/resources.yaml')
+      FileUtils.copy(
+        File.join(@testdir, 'spec/fixtures/product_spec_files/lightbulb.yaml'),
+        'specs/resources.yaml',
+      )
       File.open('Solutionfile.json', 'wb') do |io|
         io << {
-          :default_page => 'index.html',
-          :assets => 'files',
-          :routes => 'routes/manyRoutes.lua',
-          :modules => {
-            :table_util => 'modules/table_util.lua'
+          default_page: 'index.html',
+          assets: 'files',
+          routes: 'routes/manyRoutes.lua',
+          # Note that singleRoute.lua is not included, so it won't be seen by status command.
+          modules: {
+            table_util: 'modules/table_util.lua'
           },
-          :services => {
-            :device => {
-              :datapoint => 'services/devdata.lua'
+          services: {
+            device: {
+              datapoint: 'services/devdata.lua'
             }
           },
-          :version => '0.3.0',
+          version: '0.3.0',
         }.to_json
       end
     end
 
     it "status" do
       out, err, status = Open3.capture3(capcmd('murano', 'status'))
+      # pp out.split "\n"
       expect(err).to eq('')
       olines = out.lines
-      expect(olines[0]).to eq("Adding:\n")
-      expect(olines[1..7]).to include(
-        a_string_matching(/ \+ A  .*routes\/manyRoutes\.lua/),
-        a_string_matching(/ \+ A  .*routes\/manyRoutes\.lua:4/),
-        a_string_matching(/ \+ A  .*routes\/manyRoutes\.lua:7/),
-        a_string_matching(/ \+ S  .*files\/icon\.png/),
-        a_string_matching(/ \+ S  .*files\/index\.html/),
-        a_string_matching(/ \+ S  .*files\/js\/script\.js/),
-        a_string_matching(/ \+ M  .*modules\/table_util\.lua/),
-      )
-      expect(olines[8]).to eq("Deleteing:\n")
-      expect(olines[9..11]).to include(
-        " - M  my_library\n",
-        " - E  user_account\n",
-        " - E  timer_timer\n",
-      )
-      expect(olines[12]).to eq("Changing:\n")
-      expect(olines[13..14]).to include(
-        a_string_matching(/ M E  .*services\/devdata\.lua/),
-      )
+      expect(olines[0]).to eq("Only on local machine:\n")
+      match_syncable_contents_resources(olines[1..4])
+      match_syncable_contents_except_singleRoute(olines[5..11])
+      #expect(olines[12]).to eq("Only on remote server:\n")
+      #match_remote_boilerplate_v1_0_0_service(olines[13..15])
+      expect(olines[12]).to eq("Nothing new remotely\n")
+      #expect(olines[16]).to eq("Nothing that differs\n")
+      expect(olines[13]).to eq("Items that differ:\n")
+      match_remote_boilerplate_v1_0_0_service(olines[14..16])
       expect(status.exitstatus).to eq(0)
     end
   end
-
 end
 
-#  vim: set ai et sw=2 ts=2 :

data/spec/cmd_syncdown_spec.rb

@@ -1,3 +1,10 @@
+# Last Modified: 2017.08.16 /coding: utf-8
+# frozen_string_literal: probably not yet
+
+# Copyright © 2016-2017 Exosite LLC.
+# License: MIT. See LICENSE.txt.
+#  vim:tw=0:ts=2:sw=2:et:ai
+
 require 'fileutils'
 require 'open3'
 require 'pathname'
@@ -7,24 +14,38 @@ RSpec.describe 'murano syncdown', :cmd, :needs_password do
   include_context "CI_CMD"
 
   before(:example) do
-    @project_name = rname('syncdownTest')
-    out, err, status = Open3.capture3(capcmd('murano', 'solution', 'create', @project_name, '--save'))
+    @product_name = rname('syncdownTestPrd')
+    out, err, status = Open3.capture3(capcmd('murano', 'product', 'create', @product_name, '--save'))
+    expect(err).to eq('')
+    soln_id = out
+    expect(soln_id.chomp).to match(/^[a-zA-Z0-9]+$/)
+    expect(status.exitstatus).to eq(0)
+
+    @applctn_name = rname('syncdownTestApp')
+    out, err, status = Open3.capture3(capcmd('murano', 'application', 'create', @applctn_name, '--save'))
     expect(err).to eq('')
-    expect(out.chomp).to match(/^[a-zA-Z0-9]+$/)
+    soln_id = out
+    expect(soln_id.chomp).to match(/^[a-zA-Z0-9]+$/)
     expect(status.exitstatus).to eq(0)
 
-    out, err, status = Open3.capture3(capcmd('murano', 'product', 'create', @project_name, '--save'))
+    out, err, status = Open3.capture3(capcmd('murano', 'assign', 'set'))
+    #expect(out).to a_string_starting_with("Linked product #{@product_name}")
+    olines = out.lines
+    expect(olines[0].encode!('UTF-8', 'UTF-8')).to eq("Linked ‘#{@product_name}’ to ‘#{@applctn_name}’\n")
+    expect(olines[1]).to eq("Created default event handler\n")
     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', @project_name))
+    # VERIFY/2017-07-03: Skipping assign unset. Murano will clean up, right?
+
+    out, err, status = Open3.capture3(capcmd('murano', 'solution', 'delete', '-y', @applctn_name))
     expect(out).to eq('')
     expect(err).to eq('')
     expect(status.exitstatus).to eq(0)
 
-    out, err, status = Open3.capture3(capcmd('murano', 'product', 'delete', @project_name))
+    out, err, status = Open3.capture3(capcmd('murano', 'solution', 'delete', '--yes', @product_name))
     expect(out).to eq('')
     expect(err).to eq('')
     expect(status.exitstatus).to eq(0)
@@ -35,52 +56,111 @@ RSpec.describe 'murano syncdown', :cmd, :needs_password do
       FileUtils.cp_r(File.join(@testdir, 'spec/fixtures/syncable_content/.'), '.')
       FileUtils.move('assets','files')
       #FileUtils.mkpath('specs')
-      #FileUtils.copy(File.join(@testdir, 'spec/fixtures/product_spec_files/lightbulb.yaml'), 'specs/resources.yaml')
+      #FileUtils.copy(File.join(@testdir, 'spec/fixtures/product_spec_files/lightbulb.yaml'),
+      #  'specs/resources.yaml')
+      # 2017-07-03: So long as this command does not syncdown first, these
+      # two files -- that conflict in name with what's on the platform --
+      # won't be a problem (but would be if we synceddown first).
+      FileUtils.cp_r(File.join(@testdir, 'spec/fixtures/syncable_conflict/.'), '.')
     end
 
     it "syncdown" do
       out, err, status = Open3.capture3(capcmd('murano', 'syncup'))
-      expect(out).to eq('')
-      expect(err).to eq('')
+      #expect(out).to eq('')
+      #out_lines = out.lines
+      out_lines = out.lines.map { |line| line.encode!('UTF-8', 'UTF-8') }
+      expect(out_lines).to match_array([
+        "Adding item table_util\n",
+        "Updating item timer_timer\n",
+        # E.g., "Updating item i4kl64nn86xk00000_event\n":
+        a_string_starting_with('Updating item '),
+        "Updating item tsdb_exportJob\n",
+        "Updating item user_account\n",
+        # FIXME/2017-08-09: This test includes a fixture with "device2 data_in",
+        # which is deprecated, AFAIK [lb]. We convert it to "device2.event",
+        # but I think what we really want is to edit "<solution_id>.event".
+        "Adding item device2_event\n",
+        "Adding item POST_/api/fire\n",
+        "Adding item PUT_/api/fire/{code}\n",
+        "Adding item DELETE_/api/fire/{code}\n",
+        "Adding item GET_/api/onfire\n",
+        "Adding item /icon.png\n",
+        "Adding item /\n",
+        "Adding item /js/script.js\n",
+      ])
+
+      #expect(err).to eq('')
+      expect(err).to start_with("\e[33mSkipping missing location ‘")
       expect(status.exitstatus).to eq(0)
 
       FileUtils.rm_r(['files', 'modules', 'routes', 'services'])
       expect(Dir['**/*']).to eq([])
 
       out, err, status = Open3.capture3(capcmd('murano', 'syncdown'))
-      expect(out).to eq('')
-      expect(err.lines).to include(
-        a_string_ending_with("routes\e[0m\n"),
-        a_string_ending_with("files\e[0m\n"),
-        a_string_ending_with("modules\e[0m\n"),
-        a_string_ending_with("services\e[0m\n"),
-      )
+      #expect(out).to eq('')
+      out_lines = out.lines.map { |line| line.encode!('UTF-8', 'UTF-8') }
+      expect(out_lines).to match_array([
+        "Adding item table_util\n",
+        # 2017-08-08: This says updating now because timer.timer is undeletable.
+        #"Adding item timer_timer\n",
+        "Updating item timer_timer\n",
+        "Adding item POST_/api/fire\n",
+        "Adding item DELETE_/api/fire/{code}\n",
+        "Adding item PUT_/api/fire/{code}\n",
+        "Adding item GET_/api/onfire\n",
+        "Adding item /js/script.js\n",
+        "Adding item /icon.png\n",
+        "Adding item /\n",
+      ])
+      # Look for skipping missing location lines, e.g.,
+      #   "\e[33mSkipping missing location /tmp/d20170623-20035-17496y/project/modules\e[0m\n"
+      # 2017-07-03: Did I [lb] change syncdown not to complain about missing locations?
+      #expect(err.lines).to include(
+      #  a_string_ending_with("routes\e[0m\n"),
+      #  a_string_ending_with("files\e[0m\n"),
+      #  a_string_ending_with("modules\e[0m\n"),
+      #  a_string_ending_with("services\e[0m\n"),
+      #)
+      #expect(err).to eq('')
+      expect(err).to start_with("\e[33mSkipping missing location ‘")
       expect(status.exitstatus).to eq(0)
 
       after = Dir['**/*'].sort
-      expect(after).to include("files",
-                           "files/icon.png",
-                           "files/index.html",
-                           "files/js",
-                           "files/js/script.js",
-                           "modules",
-                           "modules/table_util.lua",
-                           "routes",
-                           "routes/api-fire-{code}.delete.lua",
-                           "routes/api-fire-{code}.put.lua",
-                           "routes/api-fire.post.lua",
-                           "routes/api-onfire.get.lua",
-                           "services",
-                           "services/device_datapoint.lua",
-                           "services/timer_timer.lua")
-    end
-  end
+      expect(after).to include(
+        "files",
+        "files/icon.png",
+        "files/index.html",
+        "files/js",
+        "files/js/script.js",
+        "modules",
+        "modules/table_util.lua",
+        "routes",
+        "routes/api-fire-{code}.delete.lua",
+        "routes/api-fire-{code}.put.lua",
+        "routes/api-fire.post.lua",
+        "routes/api-onfire.get.lua",
+        # 2017-07-03: services/ would not exist if we did not include fixtures/syncable_conflict/.
+        "services",
+        # 2017-07-13: No longer syncing device2_event; is internal to platform.
+        #"services/device2_event.lua",
+        "services/timer_timer.lua",
+      )
 
+      # A status should show no differences.
+      out, err, status = Open3.capture3(capcmd('murano', 'status'))
+      expect(err).to eq('')
+      expect(out.lines).to match([
+        "Nothing new locally\n",
+        "Nothing new remotely\n",
+        "Nothing that differs\n",
+      ])
+      expect(status.exitstatus).to eq(0)
 
+    end
+  end
 
   # TODO: With ProjectFile
   # TODO: With Solutionfile 0.2.0
   # TODO: With Solutionfile 0.3.0
 end
 
-#  vim: set ai et sw=2 ts=2 :