diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-05-17 22:05:51 +0300 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-05-17 22:05:51 +0300 |
| commit | a2f149c70d395003e2d36d3cdd2fdb15ee515dd7 (patch) | |
| tree | a5a3d59a05b471123aae2bb722c1a3c1d578f998 /tests.branching | |
| parent | 6f420c935496b2c22e16b5e975e9ece8326adc2b (diff) | |
| download | morph-a2f149c70d395003e2d36d3cdd2fdb15ee515dd7.tar.gz | |
Fix filenames of test morphologies
Diffstat (limited to 'tests.branching')
5 files changed, 10 insertions, 10 deletions
diff --git a/tests.branching/branch-creates-new-system-branch-not-from-master.stdout b/tests.branching/branch-creates-new-system-branch-not-from-master.stdout index 7c04a8dc..7dfffab1 100644 --- a/tests.branching/branch-creates-new-system-branch-not-from-master.stdout +++ b/tests.branching/branch-creates-new-system-branch-not-from-master.stdout @@ -8,8 +8,8 @@ d ./.morph/cache/gits/file_morphs/.git d ./newbranch d ./newbranch/morphs d ./newbranch/morphs/.git -f ./newbranch/morphs/hello-stratum.chunk -f ./newbranch/morphs/hello-system.chunk +f ./newbranch/morphs/hello-stratum.morph +f ./newbranch/morphs/hello-system.morph f ./newbranch/morphs/this.is.alfred Current branches: master diff --git a/tests.branching/branch-creates-new-system-branch.stdout b/tests.branching/branch-creates-new-system-branch.stdout index 0b0ce872..d2884b8c 100644 --- a/tests.branching/branch-creates-new-system-branch.stdout +++ b/tests.branching/branch-creates-new-system-branch.stdout @@ -8,8 +8,8 @@ d ./.morph/cache/gits/file_morphs/.git d ./newbranch d ./newbranch/morphs d ./newbranch/morphs/.git -f ./newbranch/morphs/hello-stratum.chunk -f ./newbranch/morphs/hello-system.chunk +f ./newbranch/morphs/hello-stratum.morph +f ./newbranch/morphs/hello-system.morph Current branches: master * newbranch diff --git a/tests.branching/checkout-existing-branch.stdout b/tests.branching/checkout-existing-branch.stdout index 998b8acc..7f405fdb 100644 --- a/tests.branching/checkout-existing-branch.stdout +++ b/tests.branching/checkout-existing-branch.stdout @@ -8,7 +8,7 @@ d ./.morph/cache/gits/file_morphs/.git d ./master d ./master/morphs d ./master/morphs/.git -f ./master/morphs/hello-stratum.chunk -f ./master/morphs/hello-system.chunk +f ./master/morphs/hello-stratum.morph +f ./master/morphs/hello-system.morph Current branches: * master diff --git a/tests.branching/edit-checkouts-existing-chunk.stdout b/tests.branching/edit-checkouts-existing-chunk.stdout index 929db3e4..a88a747b 100644 --- a/tests.branching/edit-checkouts-existing-chunk.stdout +++ b/tests.branching/edit-checkouts-existing-chunk.stdout @@ -5,4 +5,4 @@ Current branches, hello: * alfred master Files in hello: -hello.chunk +hello.morph diff --git a/tests.branching/setup b/tests.branching/setup index 1e337412..5c0e9a04 100755 --- a/tests.branching/setup +++ b/tests.branching/setup @@ -43,7 +43,7 @@ mkdir "$DATADIR/mine" # Create a fake morphs repository mkdir "$DATADIR/morphs" -cat <<EOF > "$DATADIR/morphs/hello-system.chunk" +cat <<EOF > "$DATADIR/morphs/hello-system.morph" { "name": "hello-system", "kind": "system", @@ -54,7 +54,7 @@ cat <<EOF > "$DATADIR/morphs/hello-system.chunk" } EOF -cat <<EOF > "$DATADIR/morphs/hello-stratum.chunk" +cat <<EOF > "$DATADIR/morphs/hello-stratum.morph" { "name": "hello-stratum", "kind": "stratum", @@ -84,7 +84,7 @@ scripts/run-git-in "$DATADIR/morphs" checkout master # Create a dummy chunk repository mkdir "$DATADIR/hello" -cat <<EOF > "$DATADIR/hello/hello.chunk" +cat <<EOF > "$DATADIR/hello/hello.morph" { "name": "hello", "kind": "chunk", |