From 270faa339014ab338daf9bc967c022da73f221ea Mon Sep 17 00:00:00 2001 From: kshann Date: Thu, 21 Nov 2024 11:26:57 +1100 Subject: [PATCH] Mattermost improvements (#20) --- .../notarized-build-complete.txt.erb | 2 +- .../templates/notarized-build-failed.txt.erb | 2 +- .../templates/public-release-complete.txt.erb | 2 +- .../templates/public-release-failed.txt.erb | 2 +- .../plugin/ddg_apple_automation/version.rb | 2 +- spec/mattermost_send_message_action_spec.rb | 23 ++++++++++++++++++- 6 files changed, 27 insertions(+), 6 deletions(-) diff --git a/lib/fastlane/plugin/ddg_apple_automation/assets/mattermost_send_message/templates/notarized-build-complete.txt.erb b/lib/fastlane/plugin/ddg_apple_automation/assets/mattermost_send_message/templates/notarized-build-complete.txt.erb index c7e64a8..40758e6 100644 --- a/lib/fastlane/plugin/ddg_apple_automation/assets/mattermost_send_message/templates/notarized-build-complete.txt.erb +++ b/lib/fastlane/plugin/ddg_apple_automation/assets/mattermost_send_message/templates/notarized-build-complete.txt.erb @@ -1 +1 @@ -Notarized macOS app `<%= release_type %>` build is ready :goose_honk_tada: | [:github: Workflow run summary](<%= workflow_url %>)<% if defined?(asana_task_url) %> | [:asana: Asana Task](<%= asana_task_url %>)<% end %> \ No newline at end of file +Notarized macOS app `<%= release_type %>` build is ready :goose_honk_tada: | [:github: Workflow run summary](<%= workflow_url %>)<% if defined?(asana_task_url) && !asana_task_url.to_s.strip.empty? %> | [:asana: Asana Task](<%= asana_task_url %>)<% end %> \ No newline at end of file diff --git a/lib/fastlane/plugin/ddg_apple_automation/assets/mattermost_send_message/templates/notarized-build-failed.txt.erb b/lib/fastlane/plugin/ddg_apple_automation/assets/mattermost_send_message/templates/notarized-build-failed.txt.erb index e2105c0..c25fee7 100644 --- a/lib/fastlane/plugin/ddg_apple_automation/assets/mattermost_send_message/templates/notarized-build-failed.txt.erb +++ b/lib/fastlane/plugin/ddg_apple_automation/assets/mattermost_send_message/templates/notarized-build-failed.txt.erb @@ -1 +1 @@ -:rotating_light: Notarized macOS app `<%= release_type %>` build failed | [:github: Workflow run summary](<%= workflow_url %>)<% if defined?(asana_task_url) %> | [:asana: Asana Task](<%= asana_task_url %>)<% end %> \ No newline at end of file +:rotating_light: Notarized macOS app `<%= release_type %>` build failed | [:github: Workflow run summary](<%= workflow_url %>)<% if defined?(asana_task_url) && !asana_task_url.to_s.strip.empty? %> | [:asana: Asana Task](<%= asana_task_url %>)<% end %> \ No newline at end of file diff --git a/lib/fastlane/plugin/ddg_apple_automation/assets/mattermost_send_message/templates/public-release-complete.txt.erb b/lib/fastlane/plugin/ddg_apple_automation/assets/mattermost_send_message/templates/public-release-complete.txt.erb index 7664fe3..d18ee20 100644 --- a/lib/fastlane/plugin/ddg_apple_automation/assets/mattermost_send_message/templates/public-release-complete.txt.erb +++ b/lib/fastlane/plugin/ddg_apple_automation/assets/mattermost_send_message/templates/public-release-complete.txt.erb @@ -1 +1 @@ -<%= app_platform %> app has been successfully uploaded to <%= destination %> :goose_honk_tada: | [:github: Workflow run summary](<%= workflow_url %>) \ No newline at end of file +<%= platform %> app has been successfully uploaded to <%= destination %> :goose_honk_tada: | [:github: Workflow run summary](<%= workflow_url %>) \ No newline at end of file diff --git a/lib/fastlane/plugin/ddg_apple_automation/assets/mattermost_send_message/templates/public-release-failed.txt.erb b/lib/fastlane/plugin/ddg_apple_automation/assets/mattermost_send_message/templates/public-release-failed.txt.erb index aa38c91..7f6a981 100644 --- a/lib/fastlane/plugin/ddg_apple_automation/assets/mattermost_send_message/templates/public-release-failed.txt.erb +++ b/lib/fastlane/plugin/ddg_apple_automation/assets/mattermost_send_message/templates/public-release-failed.txt.erb @@ -1 +1 @@ -:rotating_light: macOS app <%= destination %> workflow failed | [:github: Workflow run summary](<%= workflow_url %>) \ No newline at end of file +:rotating_light: <%= platform %> app <%= destination %> workflow failed | [:github: Workflow run summary](<%= workflow_url %>) \ No newline at end of file diff --git a/lib/fastlane/plugin/ddg_apple_automation/version.rb b/lib/fastlane/plugin/ddg_apple_automation/version.rb index 712598a..e532462 100644 --- a/lib/fastlane/plugin/ddg_apple_automation/version.rb +++ b/lib/fastlane/plugin/ddg_apple_automation/version.rb @@ -1,5 +1,5 @@ module Fastlane module DdgAppleAutomation - VERSION = "0.11.6" + VERSION = "0.11.7" end end diff --git a/spec/mattermost_send_message_action_spec.rb b/spec/mattermost_send_message_action_spec.rb index 814b3fc..9d6aeab 100644 --- a/spec/mattermost_send_message_action_spec.rb +++ b/spec/mattermost_send_message_action_spec.rb @@ -75,6 +75,26 @@ })).to eq(expected) end + it "processes notarized-build-complete template with a nil asana_task_url" do + expected = "Notarized macOS app `release` build is ready :goose_honk_tada: | [:github: Workflow run summary](https://workflow.com)" + + expect(process_template("notarized-build-complete", { + "release_type" => "release", + "workflow_url" => "https://workflow.com", + "asana_task_url" => nil + })).to eq(expected) + end + + it "processes notarized-build-complete template with an empty asana_task_url" do + expected = "Notarized macOS app `release` build is ready :goose_honk_tada: | [:github: Workflow run summary](https://workflow.com)" + + expect(process_template("notarized-build-complete", { + "release_type" => "release", + "workflow_url" => "https://workflow.com", + "asana_task_url" => "" + })).to eq(expected) + end + it "processes notarized-build-complete template with Asana task URL" do expected = "Notarized macOS app `release` build is ready :goose_honk_tada: | [:github: Workflow run summary](https://workflow.com) | [:asana: Asana Task](https://asana.com)" @@ -108,7 +128,7 @@ expected = "macOS app has been successfully uploaded to testflight :goose_honk_tada: | [:github: Workflow run summary](https://workflow.com)" expect(process_template("public-release-complete", { - "app_platform" => "macOS", + "platform" => "macOS", "destination" => "testflight", "workflow_url" => "https://workflow.com" })).to eq(expected) @@ -118,6 +138,7 @@ expected = ":rotating_light: macOS app testflight workflow failed | [:github: Workflow run summary](https://workflow.com)" expect(process_template("public-release-failed", { + "platform" => "macOS", "destination" => "testflight", "workflow_url" => "https://workflow.com" })).to eq(expected)