feature.stem installs to workflow name where workflow name is basenam…

…e of stem suite

unit test _get_name method

cylc/rose/stem.py

@@ -369,7 +369,7 @@ def _generate_name(self):
                 basedir = os.path.abspath(self.opts.source)
             else:
                 basedir = os.getcwd()
-        name = os.path.basename(basedir)
+        name = os.path.basename(os.path.dirname(basedir))
         self.reporter(NameSetEvent(name))
         return name
 

tests/unit/test_rose_stem_units.py

@@ -16,10 +16,11 @@
 """Functional tests for top-level function record_cylc_install_options and
 """
 
+import os
 import pytest
 from types import SimpleNamespace
 
-from cylc.rose.stem import get_source_opt_from_args
+from cylc.rose.stem import get_source_opt_from_args, StemRunner
 
 
 @pytest.mark.parametrize(
@@ -54,3 +55,45 @@ def test_get_source_opt_from_args(tmp_path, monkeypatch, args, expect):
         assert result == expect
     else:
         assert result == expect.format(tmp_path=str(tmp_path))
+
+
+class Test_generate_name:
+    """Try 3 paths in StemRunner._generate_name.
+
+    Contains a setup function for each path.
+    """
+    EXPECT = 'bar'
+    MSG = 'Suite is named bar'
+
+    @staticmethod
+    def name_from_fcm(monkeypatch):
+        """It gets the name from _ascertain_project."""
+        class MonkeyStemRunner(StemRunner):
+            def _ascertain_project(self, x):
+                return ['foo', '/foo/bar/baz']
+        return MonkeyStemRunner(SimpleNamespace, reporter=print)
+
+    @staticmethod
+    def source_set(monkeypatch):
+        """It gets the name from the source opt."""
+        opts = SimpleNamespace()
+        opts.source = 'bar/rose-stem'
+        stemrunner = StemRunner(opts, reporter=print)
+        return stemrunner
+
+    @staticmethod
+    def source_unset(monkeypatch):
+        """It gets the name from the file path."""
+        opts = SimpleNamespace()
+        opts.source = ''
+        monkeypatch.setattr(os, "getcwd", lambda: "/foo/bar/baz")
+        stemrunner = StemRunner(opts, reporter=print)
+        return stemrunner
+
+    @pytest.mark.parametrize(
+        'setup', [
+            'source_set', 'source_unset', 'name_from_fcm'])
+    def test__generate_name(self, capsys, monkeypatch, setup):
+        result = getattr(self, setup)(monkeypatch)._generate_name()
+        assert result == self.EXPECT
+        assert self.MSG in capsys.readouterr().out