summaryrefslogtreecommitdiff
path: root/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-03 19:06:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-03 19:06:44 (GMT)
commite3798318b12502ae13a8e35e4a385665e810047f (patch)
treed8fb6d6d05afc33a7ad37b54ef9caf142da46a63 /contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh
parent59e0821a81fd82e8aafb8a581d2f001a4ec3e33d (diff)
parent9742fb7e53b2f3bd85b5f01e563aee2cad7e77b8 (diff)
downloadgit-e3798318b12502ae13a8e35e4a385665e810047f.zip
git-e3798318b12502ae13a8e35e4a385665e810047f.tar.gz
git-e3798318b12502ae13a8e35e4a385665e810047f.tar.bz2
Merge branch 'mm/mediawiki-encoding-fix'
* mm/mediawiki-encoding-fix: git-remote-mediawiki: fix encoding issue for UTF-8 media files git-remote-mediawiki: allow stop/start-ing the test server
Diffstat (limited to 'contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh')
-rwxr-xr-xcontrib/mw-to-git/t/t9363-mw-to-git-export-import.sh19
1 files changed, 19 insertions, 0 deletions
diff --git a/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh b/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh
index 5a03739..3ff3a09 100755
--- a/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh
+++ b/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh
@@ -58,6 +58,25 @@ test_expect_success 'git clone works on previously created wiki with media files
test_cmp mw_dir_clone/Foo.txt mw_dir/Foo.txt
'
+test_expect_success 'git push can upload media (File:) files containing valid UTF-8' '
+ wiki_reset &&
+ git clone mediawiki::'"$WIKI_URL"' mw_dir &&
+ (
+ cd mw_dir &&
+ "$PERL_PATH" -e "print STDOUT \"UTF-8 content: éèàéê€.\";" >Bar.txt &&
+ git add Bar.txt &&
+ git commit -m "add a text file with UTF-8 content" &&
+ git push
+ )
+'
+
+test_expect_success 'git clone works on previously created wiki with media files containing valid UTF-8' '
+ test_when_finished "rm -rf mw_dir mw_dir_clone" &&
+ git clone -c remote.origin.mediaimport=true \
+ mediawiki::'"$WIKI_URL"' mw_dir_clone &&
+ test_cmp mw_dir_clone/Bar.txt mw_dir/Bar.txt
+'
+
test_expect_success 'git push & pull work with locally renamed media files' '
wiki_reset &&
git clone mediawiki::'"$WIKI_URL"' mw_dir &&