From 51bfd906e617f88adc96642c2e7e9478b182e099 Mon Sep 17 00:00:00 2001
From: Michael Mintz <mdmintz@gmail.com>
Date: Thu, 4 Feb 2016 00:27:01 -0500
Subject: [PATCH 1/2] Upgrade to selenium version 2.50.0
---
integrations/docker/docker_requirements.txt | 2 +-
integrations/selenium_grid/start-selenium-node.bat | 2 +-
integrations/selenium_grid/start-selenium-server.sh | 2 +-
requirements.txt | 2 +-
seleniumbase/core/selenium_launcher.py | 4 ++--
setup.py | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/integrations/docker/docker_requirements.txt b/integrations/docker/docker_requirements.txt
index bd4a1b90614..db83487ed63 100755
--- a/integrations/docker/docker_requirements.txt
+++ b/integrations/docker/docker_requirements.txt
@@ -1,4 +1,4 @@
-selenium==2.48.0
+selenium==2.50.0
nose==1.3.7
pytest==2.8.5
flake8==2.5.1
diff --git a/integrations/selenium_grid/start-selenium-node.bat b/integrations/selenium_grid/start-selenium-node.bat
index 6668d1bf4ea..a4200fb8fed 100644
--- a/integrations/selenium_grid/start-selenium-node.bat
+++ b/integrations/selenium_grid/start-selenium-node.bat
@@ -1,2 +1,2 @@
cd c:\
-java -jar selenium-server-standalone-2.48.2.jar -role node -hub http://[ENTER URL OF THE GRID HUB SERVER]:4444/grid/register -browser browserName=chrome,maxInstances=5 -browser browserName=firefox,maxInstances=5 -browser browserName="internet explorer",maxInstances=1
\ No newline at end of file
+java -jar selenium-server-standalone-2.50.0.jar -role node -hub http://[ENTER URL OF THE GRID HUB SERVER]:4444/grid/register -browser browserName=chrome,maxInstances=5 -browser browserName=firefox,maxInstances=5 -browser browserName="internet explorer",maxInstances=1
\ No newline at end of file
diff --git a/integrations/selenium_grid/start-selenium-server.sh b/integrations/selenium_grid/start-selenium-server.sh
index ce62a2b5f76..90b9b9dec4c 100755
--- a/integrations/selenium_grid/start-selenium-server.sh
+++ b/integrations/selenium_grid/start-selenium-server.sh
@@ -1,2 +1,2 @@
#!/bin/bash
-java -jar selenium-server-standalone-2.48.2.jar -role hub
\ No newline at end of file
+java -jar selenium-server-standalone-2.50.0.jar -role hub
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index ed79690248c..0696a89faf2 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-selenium==2.48.0
+selenium==2.50.0
nose==1.3.7
pytest==2.8.5
flake8==2.5.1
diff --git a/seleniumbase/core/selenium_launcher.py b/seleniumbase/core/selenium_launcher.py
index d578c021fb8..70fd8dbdc61 100755
--- a/seleniumbase/core/selenium_launcher.py
+++ b/seleniumbase/core/selenium_launcher.py
@@ -7,8 +7,8 @@
import time
SELENIUM_JAR = ("http://selenium-release.storage.googleapis.com"
- "/2.48/selenium-server-standalone-2.48.2.jar")
-JAR_FILE = "selenium-server-standalone-2.48.2.jar"
+ "/2.50/selenium-server-standalone-2.50.0.jar")
+JAR_FILE = "selenium-server-standalone-2.50.0.jar"
def download_selenium():
diff --git a/setup.py b/setup.py
index 700cee801b7..3871fc20f58 100755
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
description='The SeleniumBase Automation Framework',
license='The MIT License',
install_requires=[
- 'selenium==2.48.0',
+ 'selenium==2.50.0',
'nose==1.3.7',
'pytest==2.8.5',
'flake8==2.5.1',
From 757f6ecff39ee136246c217ea28082d9ebd290cd Mon Sep 17 00:00:00 2001
From: Michael Mintz <mdmintz@gmail.com>
Date: Thu, 4 Feb 2016 00:30:28 -0500
Subject: [PATCH 2/2] Now version 1.1.21
---
integrations/docker/docker_setup.py | 2 +-
setup.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/integrations/docker/docker_setup.py b/integrations/docker/docker_setup.py
index 2a80e35a904..14838c5ab86 100755
--- a/integrations/docker/docker_setup.py
+++ b/integrations/docker/docker_setup.py
@@ -8,7 +8,7 @@
setup(
name='seleniumbase',
- version='1.1.20',
+ version='1.1.21',
author='Michael Mintz',
author_email='@mintzworld',
maintainer='Michael Mintz',
diff --git a/setup.py b/setup.py
index 3871fc20f58..40c59b08929 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
setup(
name='seleniumbase',
- version='1.1.20',
+ version='1.1.21',
url='https://github.com/mdmintz/SeleniumBase',
author='Michael Mintz',
author_email='@mintzworld',