diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-11-05 15:49:22 +0000 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-11-05 15:49:22 +0000 |
commit | b265218489791c6c1d3682c503609fa2a9ce030a (patch) | |
tree | 582823622c25db4b17d42a7fbeaaf008e8e422a9 /yarns/regression.yarn | |
parent | 00246636d66961cf50fea902972e828ae0890f7b (diff) | |
parent | d3d49283aad741aab40c39cb7e54c814d8a06ea1 (diff) | |
download | morph-b265218489791c6c1d3682c503609fa2a9ce030a.tar.gz |
Merge remote-tracking branch 'origin/danielfirth/language-changes'
Needed to update copyright years when merging. Don't understand why
the problem didn't show up earlier, since it doesn't seem to have
been caused by Dan's changes.
Diffstat (limited to 'yarns/regression.yarn')
-rw-r--r-- | yarns/regression.yarn | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/yarns/regression.yarn b/yarns/regression.yarn index 7480655d..a17d2f87 100644 --- a/yarns/regression.yarn +++ b/yarns/regression.yarn @@ -9,7 +9,7 @@ Testing if we can build after checking out from a tag. SCENARIO morph build works after checkout from a tag GIVEN a workspace AND a git server - WHEN checking out the test-tag system tag + WHEN the user checks out the system tag called test-tag THEN morph build the system simple-system of the tag test-tag of the repo test:morphs @@ -19,13 +19,13 @@ remove the existing directory. SCENARIO re-running 'morph branch' fails, original branch untouched GIVEN a workspace AND a git server - WHEN user creates system branch foo + WHEN the user creates a system branch called foo THEN the system branch foo is checked out The branch is checked out correctly, now it should fail if the user executes `morph branch` with the same branch name. - WHEN user attempts to create system branch foo + WHEN the user attempts to create a system branch called foo THEN morph failed AND the branch error message includes the string "File exists" |