From 59f145e3d6b59120a18f86af272c19ddff39bd88 Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Fri, 7 Sep 2018 10:26:00 +0200
Subject: [PATCH] [Grid] Adding image for Safari Technology Preview, fixes
 #6297

---
 .../grid/images/safari_technology_preview.png    | Bin 0 -> 1393 bytes
 .../grid/web/servlet/console/MiniCapability.java |  12 +++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 java/server/src/org/openqa/grid/images/safari_technology_preview.png

diff --git a/java/server/src/org/openqa/grid/images/safari_technology_preview.png b/java/server/src/org/openqa/grid/images/safari_technology_preview.png
new file mode 100644
index 0000000000000000000000000000000000000000..4958b23c6f1794cee6a36cca8b98b24cce91eff9
GIT binary patch
literal 1393
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z%2~Ij105p
zNH8!kMrMXYltlRYSS9D@>LsS+C#C9D<Q4!`GcedxSOJ;2sU?XD6}dTi#a0!zN?;XM
zKsHENUr7P1q$Jx`DZ)2E!8yMuRl!uxM9)CUj!Qv7!KNrB%__*n4XPc;vsKC{DJihh
z*Do(G*DE*H%P&gTH?*|0)Hg8FH!{)%s?aU2%qvN((9J7Wh8O}f$0fBmxhS)sBr`ux
z0c37sQhsTPt&$SRA~=A!vm`SOVN+f))LTFg>VstT4fPE4;bsH1+JHo@{EISEfi{E8
zw==W>t3(ll+GC>+vK+}V5TAlYfnK%aveAbJn;n<WA@xWG2IeMD7sn6_LEYfo3>jC6
zy0o<N{O@Md_Zs`YdV2VXQc%ugcWzTNHQud3no)m~SysB<p3f%2@}G0L#tZ$aUBBE{
zuHabsS5a$9R!8QQAgzUg(pj@is^W^Kn@s<`@9yonHw(9YX-vFV`Mh@C%<_BX93o4m
zxcIs#hHP8>X7Sdb;v=7%;+{SZi;3TOd#&cv|NqK*#C~3tQc==Ak#SJfeqyZ7p1o5)
zUz%FO9XDA!^g!12iLcBqUd{hM^WE!N0UyOh`d3C~2pT%=jjPXp81(IH_x;%B?UHO6
zl3o*qT*@!Es<gRJ`fkx&EuVeP<EGWJ6Y<)Dy0_dmN6wDev8U?Q^7YSly58#izy4%|
zDxa8^V5udi_|z>fyL9D0JbnG^U-0=yjeD7sTV5E4th}?eAoc0pmz#^b1eBM?b1sfH
zdlMn#r_|{Z&9!cuZ1pMEJNCtH>%Zl5>&=fpbZP4w_dqF=>8IzO(G|^IFUGRe-olti
zcv<G^M5kMv9AbwjpR{}<tX>#+zdy)!ZNAR)pRal^y(?N<GbL|Lu58TTbm2VRC5t=`
zl*mT)tYp8E@Z9WU$#3%)`u)jTzm2X1S09)*`-6?r_2Sf=XWRKMMs2+ru50?>x&^0T
z(+owa@Y*B%4DM>r66aR(?q6%yKJ}e*!HS0alOFgwD*5ewb#Lv*hU_`)50n^E8Tahs
zKD$K1@?NiLk$j#^wP1a`B~#K1jy-G@E4;KVES_hu?pv417JFUymhh`ao@Bj$vv+q2
zKW96zmDgwPZ`sPnk_M+4OSKDHxzE{5Rh!<$d~Ac8ZuIUcxAL6*IcNTTt#<65zp~|n
z$8W^#lRqZ6B}j3ku$Hdxa$C%F^CD9xd%?D&0-LwSub8@J-<vnN&9BX09A1A%b2q!`
zoPQ74b@oWE`sH15k}K=1QC6>z)K{)GvQ80vmxX2B4D(Lq=bK)7^XAR->(9CM*NR_@
zZjCv4V&1eTebu=h{Y@<*le{OSbR5xZx%B1ejbQ#)FB_k%c6N4_-?T!Qoqh82@^@7)
z8lw5jo``v0y19~bVY|>Yg)4$VuSFMLJly)w<L$)b<(t>-+veZi-hMxz*JaDelb&XF
zcJI=RdJivNe7^os$&KUOH;r`HT@7(%67cGHEAir$@5XcU%=T|K|9I`ii5J!v4+`cj
zEr@n;>3exo{`eoYxPsSfYwNsAR^8V~S~hL_?X%n}Vl`zSE~>9{E1c=mwo33Hzrfth
UwGVv4+CT-Hr>mdKI;Vst0GE_QVE_OC

literal 0
HcmV?d00001

diff --git a/java/server/src/org/openqa/grid/web/servlet/console/MiniCapability.java b/java/server/src/org/openqa/grid/web/servlet/console/MiniCapability.java
index b15831fc715b8..84f4560cbafe2 100644
--- a/java/server/src/org/openqa/grid/web/servlet/console/MiniCapability.java
+++ b/java/server/src/org/openqa/grid/web/servlet/console/MiniCapability.java
@@ -17,6 +17,8 @@
 
 package org.openqa.grid.web.servlet.console;
 
+import com.google.common.base.Strings;
+
 import org.openqa.grid.internal.TestSlot;
 import org.openqa.selenium.remote.BrowserType;
 import org.openqa.selenium.remote.DesiredCapabilities;
@@ -69,7 +71,7 @@ private String getConsoleIconPath(DesiredCapabilities cap) {
 
   private String consoleIconName(DesiredCapabilities cap) {
     String browserString = cap.getBrowserName();
-    if (browserString == null || "".equals(browserString)) {
+    if (Strings.isNullOrEmpty(browserString)) {
       return "missingBrowserName";
     }
 
@@ -92,8 +94,12 @@ private String consoleIconName(DesiredCapabilities cap) {
         ret = BrowserType.FIREFOX;
       }
 
-    } else if (browserString.startsWith("*safari")) {
-      ret = BrowserType.SAFARI;
+    } else if (browserString.toLowerCase().contains("safari")) {
+      if (browserString.toLowerCase().contains("technology")) {
+        ret = "safari_technology_preview";
+      } else {
+        ret = BrowserType.SAFARI;
+      }
     } else if (browserString.startsWith("*googlechrome")) {
       ret = BrowserType.CHROME;
     } else if (browserString.startsWith("opera")) {