Merge pull request zotero#2258 from adomasven/fix-translator-tester

Fix translator tester
bufordrat · Oct 9, 2020 · 4043dbb · 4043dbb
2 parents 733e7be + 0a9711b
commit 4043dbb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.ci/pull-request-check/check-pull-request.sh b/.ci/pull-request-check/check-pull-request.sh
@@ -25,9 +25,9 @@ get_translators_to_check() {
 		# Size of $PARENT_COMMITS array
 		NUM_PARENT_COMMITS=${#PARENT_COMMITS[@]}
 		if [ $NUM_PARENT_COMMITS -gt 1 ]; then
-			TRANSLATORS_TO_CHECK=$(git diff HEAD^2 $(git rev-list "$(git rev-list --first-parent ^HEAD^2 master | tail -n1)^^!") --name-only | grep -e "^[^/]*.js$")
+			TRANSLATORS_TO_CHECK=$(git diff HEAD^2 $(git rev-list "$(git rev-list --first-parent ^master HEAD^2 | tail -n1)^^!") --name-only | grep -e "^[^/]*.js$")
 		else
-			TRANSLATORS_TO_CHECK=$(git diff $(git rev-list "$(git rev-list --first-parent ^HEAD master | tail -n1)^^!") --name-only | grep -e "^[^/]*.js$")
+			TRANSLATORS_TO_CHECK=$(git diff $(git rev-list "$(git rev-list --first-parent ^master HEAD | tail -n1)^^!") --name-only | grep -e "^[^/]*.js$")
 		fi
 }
 
@@ -41,11 +41,13 @@ if [ -d .git ]; then
 	git pull
 	git submodule update
 	git -C src/zotero/ submodule update -- resource/schema/global
+	git -C src/zotero submodule update -- resource/SingleFileZ
 	npm ci
 else
 	git clone https://github.com/zotero/zotero-connectors.git --depth 1 .
 	git submodule update --init --depth 1
 	git -C src/zotero submodule update --init --depth 1 -- resource/schema/global
+	git -C src/zotero submodule update --init --depth 1 -- resource/SingleFileZ
   npm ci
 fi
 

diff --git a/.ci/pull-request-check/selenium-test.js b/.ci/pull-request-check/selenium-test.js
@@ -137,6 +137,11 @@ var allPassed = false;
 			await driver.quit();
 		}
 		translatorServer.stopServing();
+		if (allPassed) {
+			console.log(chalk.green("All translator tests passed"));
+		} else {
+			console.log(chalk.red("Some translator tests failed"));
+		}
 		process.exit(allPassed ? 0 : 1);
 	}
 })();