Merge pull request #816 from Shopify/update_version_on_monorail

Update monorail cli version
Shopify · Aug 13, 2020 · cb6fa88 · cb6fa88
2 parents 1b30eb0 + 016c547
commit cb6fa88
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/lib/shopify-cli/core/monorail.rb b/lib/shopify-cli/core/monorail.rb
@@ -99,7 +99,7 @@ def build_payload(start_time, end_time, commands, args, err = nil)
               success: err.nil?,
               error_message: err,
               uname: RbConfig::CONFIG["host"],
-              cli_version: ShopifyCli::Git.sha(dir: ShopifyCli::ROOT),
+              cli_version: ShopifyCli::VERSION,
               ruby_version: RUBY_VERSION,
             }.tap do |payload|
               payload[:metadata] = JSON.dump(metadata) unless metadata.empty?

diff --git a/test/shopify-cli/core/monorail_test.rb b/test/shopify-cli/core/monorail_test.rb
@@ -6,7 +6,6 @@ module Core
     class MonorailTest < MiniTest::Test
       def setup
         super
-        ShopifyCli::Git.stubs(:sha).returns("bb6f42193239a248f054e5019e469bc75f3adf1b")
         CLI::UI::Prompt.stubs(:confirm).returns(true)
         ShopifyCli::Core::Monorail.metadata = {}
       end
@@ -66,7 +65,7 @@ def test_log_event_contains_schema_and_payload_values
                   success: true,
                   error_message: nil,
                   uname: RbConfig::CONFIG["host"],
-                  cli_version: "bb6f42193239a248f054e5019e469bc75f3adf1b",
+                  cli_version: ShopifyCli::VERSION,
                   ruby_version: RUBY_VERSION,
                   metadata: "{\"foo\":\"identifier\"}",
                   api_key: "apikey",
@@ -106,7 +105,7 @@ def test_log_event_handles_errors
                   success: false,
                   error_message: 'test error',
                   uname: RbConfig::CONFIG["host"],
-                  cli_version: "bb6f42193239a248f054e5019e469bc75f3adf1b",
+                  cli_version: ShopifyCli::VERSION,
                   ruby_version: RUBY_VERSION,
                   api_key: "apikey",
                   partner_id: 42,