From 155384472a63c7428a426ca08f08ec0f11283f94 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 8 Mar 2023 18:00:13 +0100 Subject: [PATCH] Allow primary host even when a specific role has been set --- lib/mrsk/commander.rb | 2 +- test/commander_test.rb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/mrsk/commander.rb b/lib/mrsk/commander.rb index 1b3106e2..be2fd2e3 100644 --- a/lib/mrsk/commander.rb +++ b/lib/mrsk/commander.rb @@ -25,7 +25,7 @@ class Mrsk::Commander end def primary_host - specific_hosts&.sole || config.primary_web_host + specific_hosts&.first || config.primary_web_host end def hosts diff --git a/test/commander_test.rb b/test/commander_test.rb index 31bee04a..b4ce24dc 100644 --- a/test/commander_test.rb +++ b/test/commander_test.rb @@ -42,4 +42,9 @@ class CommanderTest < ActiveSupport::TestCase @mrsk.specific_primary! assert_equal [ "1.1.1.1" ], @mrsk.hosts end + + test "primary_host with specific hosts via role" do + @mrsk.specific_roles = "web" + assert_equal "1.1.1.1", @mrsk.primary_host + end end