diff options
author | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2014-06-08 11:53:09 +0000 |
---|---|---|
committer | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2014-06-08 12:07:16 +0000 |
commit | b4087654e9e332b5d101b6be2c296f782c5e10eb (patch) | |
tree | f6571971e668ba8189d90bf9c433066248b6dca4 /yarns/branches-workspaces.yarn | |
parent | 901e79ec9020bc810230625ba824321379f24b85 (diff) | |
download | morph-baserock/ps/simple-edit-syntax.tar.gz |
WIP fixups for tests with new morph syntax. ./check --full fails, thoughbaserock/ps/simple-edit-syntax
Diffstat (limited to 'yarns/branches-workspaces.yarn')
-rw-r--r-- | yarns/branches-workspaces.yarn | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/yarns/branches-workspaces.yarn b/yarns/branches-workspaces.yarn index a9cfb19b..c542994a 100644 --- a/yarns/branches-workspaces.yarn +++ b/yarns/branches-workspaces.yarn @@ -203,16 +203,6 @@ fields when referring to strata, when it didn't before. AND in branch foo, system test-system refers to test-stratum without repo AND in branch foo, system test-system refers to test-stratum without ref -Morph edit should only work with a system argument. - - SCENARIO morph edit errors when supplied only a stratum and chunk as arguments - GIVEN a workspace - AND a git server - WHEN the user checks out the system branch called master - AND the user edits the chunk test-chunk in the stratum test-stratum with no system specified in branch master - THEN morph failed - AND the edit error message includes the string "is not a system" - Status of system branch checkout -------------------------------- @@ -226,8 +216,7 @@ repositories referenced in the system branch. WHEN the user creates a system branch called foo THEN morph reports no outstanding changes in foo - WHEN the user edits the stratum test-stratum in the system test-system in branch foo - AND the user edits the chunk test-chunk in the stratum test-stratum in the system test-system in branch foo + WHEN the user edits the chunk test-chunk in the stratum test-stratum in the system test-system in branch foo THEN morph reports changes in foo in test:morphs only WHEN creating file foo in test/test-chunk in branch foo |