summaryrefslogtreecommitdiff
path: root/yarns
diff options
context:
space:
mode:
authorPaul Sherwood <paul.sherwood@codethink.co.uk>2014-06-08 11:53:09 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-06-09 13:31:30 +0000
commit21e00e2a8acdeb5a67fb3d1eded28a4a0bcbd94a (patch)
treef6571971e668ba8189d90bf9c433066248b6dca4 /yarns
parent901e79ec9020bc810230625ba824321379f24b85 (diff)
downloadmorph-21e00e2a8acdeb5a67fb3d1eded28a4a0bcbd94a.tar.gz
Fix tests for new `morph edit` syntax
Diffstat (limited to 'yarns')
-rw-r--r--yarns/branches-workspaces.yarn13
-rw-r--r--yarns/implementations.yarn10
2 files changed, 2 insertions, 21 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
diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn
index e4f36399..0635af72 100644
--- a/yarns/implementations.yarn
+++ b/yarns/implementations.yarn
@@ -423,13 +423,9 @@ Editing morphologies with `morph edit`.
"$field" name="$MATCH_4" "$MATCH_5"; } 2>&1 |
grep -qFe "Object does not contain $MATCH_5"
- IMPLEMENTS WHEN the user edits the stratum (\S+) in the system (\S+) in branch (\S+)
- cd "$DATADIR/workspace/$MATCH_3/test/morphs"
- run_morph edit "$MATCH_2" "$MATCH_1"
-
IMPLEMENTS WHEN the user edits the chunk (\S+) in the stratum (\S+) in the system (\S+) in branch (\S+)
cd "$DATADIR/workspace/$MATCH_4/test/morphs"
- run_morph edit "$MATCH_3" "$MATCH_2" "$MATCH_1"
+ run_morph edit "$MATCH_1"
IMPLEMENTS THEN the edited chunk (\S+) has git branch (\S+)
ls -l "$DATADIR/workspace/$MATCH_2"
@@ -439,10 +435,6 @@ Editing morphologies with `morph edit`.
echo "$MATCH_2" > "$DATADIR/git-branch.wanted"
diff -u "$DATADIR/git-branch.wanted" "$DATADIR/git-branch.actual"
- IMPLEMENTS WHEN the user edits the chunk (\S+) in the stratum (\S+) with no system specified in branch (\S+)
- cd "$DATADIR/workspace/$MATCH_3"
- attempt_morph edit "$MATCH_2" "$MATCH_1"
-
To produce buildable morphologies, we need them to be of the same
architecture as the machine doing the testing. This uses `morph
print-architecture` to get a value appropriate for morph.