 9742fb7e53
			
		
	
	9742fb7e53
	
	
	
		
			
			When a media file contains valid UTF-8, git-remote-mediawiki tried to be too clever about the encoding, and the call to utf8::downgrade() on the downloaded content was failing with Wide character in subroutine entry at git-remote-mediawiki line 583. Instead, use $response->decode() to apply decoding linked to the Content-Encoding: header, and return the content without attempting any charset decoding. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			218 lines
		
	
	
		
			6.7 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			218 lines
		
	
	
		
			6.7 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
| #!/bin/sh
 | |
| #
 | |
| # Copyright (C) 2012
 | |
| #     Charles Roussel <charles.roussel@ensimag.imag.fr>
 | |
| #     Simon Cathebras <simon.cathebras@ensimag.imag.fr>
 | |
| #     Julien Khayat <julien.khayat@ensimag.imag.fr>
 | |
| #     Guillaume Sasdy <guillaume.sasdy@ensimag.imag.fr>
 | |
| #     Simon Perrat <simon.perrat@ensimag.imag.fr>
 | |
| #
 | |
| # License: GPL v2 or later
 | |
| 
 | |
| # tests for git-remote-mediawiki
 | |
| 
 | |
| test_description='Test the Git Mediawiki remote helper: git push and git pull simple test cases'
 | |
| 
 | |
| . ./test-gitmw-lib.sh
 | |
| . $TEST_DIRECTORY/test-lib.sh
 | |
| 
 | |
| 
 | |
| test_check_precond
 | |
| 
 | |
| 
 | |
| test_git_reimport () {
 | |
| 	git -c remote.origin.dumbPush=true push &&
 | |
| 	git -c remote.origin.mediaImport=true pull --rebase
 | |
| }
 | |
| 
 | |
| # Don't bother with permissions, be administrator by default
 | |
| test_expect_success 'setup config' '
 | |
| 	git config --global remote.origin.mwLogin WikiAdmin &&
 | |
| 	git config --global remote.origin.mwPassword AdminPass &&
 | |
| 	test_might_fail git config --global --unset remote.origin.mediaImport
 | |
| '
 | |
| 
 | |
| test_expect_success 'git push can upload media (File:) files' '
 | |
| 	wiki_reset &&
 | |
| 	git clone mediawiki::'"$WIKI_URL"' mw_dir &&
 | |
| 	(
 | |
| 		cd mw_dir &&
 | |
| 		echo "hello world" >Foo.txt &&
 | |
| 		git add Foo.txt &&
 | |
| 		git commit -m "add a text file" &&
 | |
| 		git push &&
 | |
| 		"$PERL_PATH" -e "print STDOUT \"binary content: \".chr(255);" >Foo.txt &&
 | |
| 		git add Foo.txt &&
 | |
| 		git commit -m "add a text file with binary content" &&
 | |
| 		git push
 | |
| 	)
 | |
| '
 | |
| 
 | |
| test_expect_success 'git clone works on previously created wiki with media files' '
 | |
| 	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/Foo.txt mw_dir/Foo.txt &&
 | |
| 	(cd mw_dir_clone && git checkout HEAD^) &&
 | |
| 	(cd mw_dir && git checkout HEAD^) &&
 | |
| 	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 &&
 | |
| 	test_when_finished "rm -fr mw_dir" &&
 | |
| 	(
 | |
| 		cd mw_dir &&
 | |
| 		echo "A File" >Foo.txt &&
 | |
| 		git add Foo.txt &&
 | |
| 		git commit -m "add a file" &&
 | |
| 		git mv Foo.txt Bar.txt &&
 | |
| 		git commit -m "Rename a file" &&
 | |
| 		test_git_reimport &&
 | |
| 		echo "A File" >expect &&
 | |
| 		test_cmp expect Bar.txt &&
 | |
| 		test_path_is_missing Foo.txt
 | |
| 	)
 | |
| '
 | |
| 
 | |
| test_expect_success 'git push can propagate local page deletion' '
 | |
| 	wiki_reset &&
 | |
| 	git clone mediawiki::'"$WIKI_URL"' mw_dir &&
 | |
| 	test_when_finished "rm -fr mw_dir" &&
 | |
| 	(
 | |
| 		cd mw_dir &&
 | |
| 		test_path_is_missing Foo.mw &&
 | |
| 		echo "hello world" >Foo.mw &&
 | |
| 		git add Foo.mw &&
 | |
| 		git commit -m "Add the page Foo" &&
 | |
| 		git push &&
 | |
| 		rm -f Foo.mw &&
 | |
| 		git commit -am "Delete the page Foo" &&
 | |
| 		test_git_reimport &&
 | |
| 		test_path_is_missing Foo.mw
 | |
| 	)
 | |
| '
 | |
| 
 | |
| test_expect_success 'git push can propagate local media file deletion' '
 | |
| 	wiki_reset &&
 | |
| 	git clone mediawiki::'"$WIKI_URL"' mw_dir &&
 | |
| 	test_when_finished "rm -fr mw_dir" &&
 | |
| 	(
 | |
| 		cd mw_dir &&
 | |
| 		echo "hello world" >Foo.txt &&
 | |
| 		git add Foo.txt &&
 | |
| 		git commit -m "Add the text file Foo" &&
 | |
| 		git rm Foo.txt &&
 | |
| 		git commit -m "Delete the file Foo" &&
 | |
| 		test_git_reimport &&
 | |
| 		test_path_is_missing Foo.txt
 | |
| 	)
 | |
| '
 | |
| 
 | |
| # test failure: the file is correctly uploaded, and then deleted but
 | |
| # as no page link to it, the import (which looks at page revisions)
 | |
| # doesn't notice the file deletion on the wiki. We fetch the list of
 | |
| # files from the wiki, but as the file is deleted, it doesn't appear.
 | |
| test_expect_failure 'git pull correctly imports media file deletion when no page link to it' '
 | |
| 	wiki_reset &&
 | |
| 	git clone mediawiki::'"$WIKI_URL"' mw_dir &&
 | |
| 	test_when_finished "rm -fr mw_dir" &&
 | |
| 	(
 | |
| 		cd mw_dir &&
 | |
| 		echo "hello world" >Foo.txt &&
 | |
| 		git add Foo.txt &&
 | |
| 		git commit -m "Add the text file Foo" &&
 | |
| 		git push &&
 | |
| 		git rm Foo.txt &&
 | |
| 		git commit -m "Delete the file Foo" &&
 | |
| 		test_git_reimport &&
 | |
| 		test_path_is_missing Foo.txt
 | |
| 	)
 | |
| '
 | |
| 
 | |
| test_expect_success 'git push properly warns about insufficient permissions' '
 | |
| 	wiki_reset &&
 | |
| 	git clone mediawiki::'"$WIKI_URL"' mw_dir &&
 | |
| 	test_when_finished "rm -fr mw_dir" &&
 | |
| 	(
 | |
| 		cd mw_dir &&
 | |
| 		echo "A File" >foo.forbidden &&
 | |
| 		git add foo.forbidden &&
 | |
| 		git commit -m "add a file" &&
 | |
| 		git push 2>actual &&
 | |
| 		test_i18ngrep "foo.forbidden is not a permitted file" actual
 | |
| 	)
 | |
| '
 | |
| 
 | |
| test_expect_success 'setup a repository with media files' '
 | |
| 	wiki_reset &&
 | |
| 	wiki_editpage testpage "I am linking a file [[File:File.txt]]" false &&
 | |
| 	echo "File content" >File.txt &&
 | |
| 	wiki_upload_file File.txt &&
 | |
| 	echo "Another file content" >AnotherFile.txt &&
 | |
| 	wiki_upload_file AnotherFile.txt
 | |
| '
 | |
| 
 | |
| test_expect_success 'git clone works with one specific page cloned and mediaimport=true' '
 | |
| 	git clone -c remote.origin.pages=testpage \
 | |
| 		  -c remote.origin.mediaimport=true \
 | |
| 			mediawiki::'"$WIKI_URL"' mw_dir_15 &&
 | |
| 	test_when_finished "rm -rf mw_dir_15" &&
 | |
| 	test_contains_N_files mw_dir_15 3 &&
 | |
| 	test_path_is_file mw_dir_15/Testpage.mw &&
 | |
| 	test_path_is_file mw_dir_15/File:File.txt.mw &&
 | |
| 	test_path_is_file mw_dir_15/File.txt &&
 | |
| 	test_path_is_missing mw_dir_15/Main_Page.mw &&
 | |
| 	test_path_is_missing mw_dir_15/File:AnotherFile.txt.mw &&
 | |
| 	test_path_is_missing mw_dir_15/AnothetFile.txt &&
 | |
| 	wiki_check_content mw_dir_15/Testpage.mw Testpage &&
 | |
| 	test_cmp mw_dir_15/File.txt File.txt
 | |
| '
 | |
| 
 | |
| test_expect_success 'git clone works with one specific page cloned and mediaimport=false' '
 | |
| 	test_when_finished "rm -rf mw_dir_16" &&
 | |
| 	git clone -c remote.origin.pages=testpage \
 | |
| 			mediawiki::'"$WIKI_URL"' mw_dir_16 &&
 | |
| 	test_contains_N_files mw_dir_16 1 &&
 | |
| 	test_path_is_file mw_dir_16/Testpage.mw &&
 | |
| 	test_path_is_missing mw_dir_16/File:File.txt.mw &&
 | |
| 	test_path_is_missing mw_dir_16/File.txt &&
 | |
| 	test_path_is_missing mw_dir_16/Main_Page.mw &&
 | |
| 	wiki_check_content mw_dir_16/Testpage.mw Testpage
 | |
| '
 | |
| 
 | |
| # should behave like mediaimport=false
 | |
| test_expect_success 'git clone works with one specific page cloned and mediaimport unset' '
 | |
| 	test_when_finished "rm -fr mw_dir_17" &&
 | |
| 	git clone -c remote.origin.pages=testpage \
 | |
| 		mediawiki::'"$WIKI_URL"' mw_dir_17 &&
 | |
| 	test_contains_N_files mw_dir_17 1 &&
 | |
| 	test_path_is_file mw_dir_17/Testpage.mw &&
 | |
| 	test_path_is_missing mw_dir_17/File:File.txt.mw &&
 | |
| 	test_path_is_missing mw_dir_17/File.txt &&
 | |
| 	test_path_is_missing mw_dir_17/Main_Page.mw &&
 | |
| 	wiki_check_content mw_dir_17/Testpage.mw Testpage
 | |
| '
 | |
| 
 | |
| test_done
 |