From a4d9be9bd513ee9893da1d29edb4d89cc44263d4 Mon Sep 17 00:00:00 2001
From: kkapsner <github@mail.kkapsner.de>
Date: Tue, 2 Oct 2018 13:18:05 +0200
Subject: [PATCH] Adjusted detection test

Firefox nightly failed function code test when CB was not installed.
---
 test/detectionTest.js | 44 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/test/detectionTest.js b/test/detectionTest.js
index a09154b..f36a406 100644
--- a/test/detectionTest.js
+++ b/test/detectionTest.js
@@ -1,4 +1,4 @@
-/* eslint no-console: off */
+/* eslint no-console: off, max-lines: off */
 var addTest = (function(){
 	"use strict";
 
@@ -116,15 +116,15 @@ addTest("function code", function(log){
 	) || codeDetected;
 	codeDetected = checkFunctionCode(
 		history.__lookupGetter__("length"),
-		"get length"
+		"(get )?length"
 	) || codeDetected;
 	codeDetected = checkFunctionCode(
 		window.__lookupGetter__("name"),
-		"get name"
+		"(get )?name"
 	) || codeDetected;
 	codeDetected = checkFunctionCode(
 		window.__lookupSetter__("name"),
-		"set name"
+		"(set )?name"
 	) || codeDetected;
 	return codeDetected;
 });
@@ -147,11 +147,41 @@ addTest("toString modified", function(log){
 		log
 	);
 });
-addTest("function name", function(){
+addTest("function name", function(log){
 	"use strict";
 	
-	return HTMLCanvasElement.prototype.toDataURL.name !== "toDataURL" ||
-		CanvasRenderingContext2D.prototype.getImageData.name !== "getImageData";
+	function checkName({func, expectedName}){
+		if (func.name !== expectedName){
+			log("unexpected function name: " + func.name + " !== " + expectedName);
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
+	
+	return [
+		{
+			func: HTMLCanvasElement.prototype.toDataURL,
+			expectedName: "toDataURL"
+		},
+		{
+			func: CanvasRenderingContext2D.prototype.getImageData,
+			expectedName: "getImageData"
+		},
+		{
+			func: history.__lookupGetter__("length"),
+			expectedName: "get length"
+		},
+		{
+			func: window.__lookupGetter__("name"),
+			expectedName: "get name"
+		},
+		{
+			func: window.__lookupSetter__("name"),
+			expectedName: "set name"
+		},
+	].map(checkName).some(function(b){return b;});
 });
 addTest("property descriptor", function(log){
 	"use strict";