Fix issue saltstack#51008

When calling cmd.run with cwd in combination
with runas the working directory was not set on macOS

This commit also adds a test to check the expected behaviour

salt/modules/cmdmod.py

@@ -413,7 +413,7 @@ def _get_stripped(cmd):
         if isinstance(cmd, (list, tuple)):
             cmd = ' '.join(map(_cmd_quote, cmd))
 
-        cmd = 'su -l {0} -c "{1}"'.format(runas, cmd)
+        cmd = 'su -l {0} -c "cd {1}; {2}"'.format(runas, cwd, cmd)
         # set runas to None, because if you try to run `su -l` as well as
         # simulate the environment macOS will prompt for the password of the
         # user and will cause salt to hang.

tests/unit/modules/test_cmdmod.py

@@ -344,6 +344,18 @@ def test_run_cwd_doesnt_exist_issue_7154(self):
         else:
             raise RuntimeError
 
+    def test_run_cwd_in_combination_with_runas(self):
+        '''
+        cmd.run executes command in the cwd directory
+        when the runas parameter is specified
+        '''
+        cmd = 'pwd'
+        cwd = '/tmp'
+        runas = 'foobar'
+
+        stdout = cmdmod._run(cmd, cwd=cwd, runas=runas).get('stdout')
+        self.assertEqual(stdout, cwd)
+
     def test_run_all_binary_replace(self):
         '''
         Test for failed decoding of binary data, for instance when doing