Merge branch 'master' into volunteer-list

HelfenKannJeder · Dec 23, 2015 · 06913ae · 06913ae
2 parents 6ab0f3f + f5143b0
commit 06913ae
Showing 1 changed file with 20 additions and 20 deletions.
diff --git a/test/behaviour/protractor.browserstack.conf.js b/test/behaviour/protractor.browserstack.conf.js
@@ -28,48 +28,48 @@ exports.config = {
 			'os': 'Windows',
 			'os_version': '7'
 		},
-		/* Fails to run! ('Not implemented')
-	{
-		'browser': 'Edge',
-		'browser_version': '12.0',
-		'os': 'Windows',
-		'os_version': '10'
-	}, */
+		/* "Error: not implemented"
+			{
+				'browser': 'Edge',
+				'browser_version': '12.0',
+				'os': 'Windows',
+				'os_version': '10'
+			},*/
+
 		{
 			'browserName': 'android',
 			'platform': 'ANDROID',
 			'device': 'Samsung Galaxy S5'
 		},
-		/* All below browsers fail to run on browserstack.
+		/* "This feature will be implemented soon"
 		{
 			'browserName' : 'android',
 			'platform' : 'ANDROID',
 			'device' : 'Google Nexus 4'
-		}, {
+		},*/
+		/* Times out
+		 {
 			'browserName': 'android',
 			'platform': 'ANDROID',
 			'device': 'Google Nexus 5'
-		}, {
+		}, */
+		{
 			'browserName': 'iPhone',
 			'platform': 'MAC',
 			'device': 'iPhone 6'
-		}, {
-			'browserName': 'iPhone',
-			'platform': 'MAC',
-			'device': 'iPhone 5'
 		}, {
 			'browserName': 'iPad',
 			'platform': 'MAC',
 			'device': 'iPad Air'
-		}, {
+		}, // Older iOS versions don’t work yet, too
+		{
 			'browser': 'Safari',
-			'browser_version': '8.0',
+			'browser_version': '9.0',
 			'os': 'OS X',
-			'os_version': 'Yosemite'
-		}, */
-		{
+			'os_version': 'El Capitan'
+		}, {
 			'browser': 'Firefox',
-			'browser_version': '41.0',
+			'browser_version': '42.0',
 			'os': 'Windows',
 			'os_version': '10'
 		}, {