Merge pull request #136 from seleniumbase/simplify-all-the-things

Simplify all the things

Author: mdmintz

README.md

@@ -9,7 +9,7 @@
 (<i>Demo of [my_first_test.py](https://github.com/seleniumbase/SeleniumBase/blob/master/examples/my_first_test.py) testing [xkcd.com](http://xkcd.com/353/)</i>)
 
 ### ![http://seleniumbase.com](https://cdn2.hubspot.net/hubfs/100006/images/super_logo_tiny.png "SeleniumBase") **Features**:
-* [Python libraries](https://github.com/seleniumbase/SeleniumBase/blob/master/seleniumbase/fixtures) to help you build reliable [WebDriver scripts](https://github.com/seleniumbase/SeleniumBase/blob/master/examples/my_first_test.py). (<i>Python 2.7 or 3.3+</i>)
+* [Python libraries](https://github.com/seleniumbase/SeleniumBase/blob/master/seleniumbase/fixtures) to help you build reliable [WebDriver scripts](https://github.com/seleniumbase/SeleniumBase/blob/master/examples/my_first_test.py). (<i>Python 2.7 or 3.4+</i>)
 * [Command-line options](https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/command_line.md) and a global [config file](https://github.com/seleniumbase/SeleniumBase/blob/master/seleniumbase/config/settings.py) to customize runs.
 * [Plugins](https://github.com/seleniumbase/SeleniumBase/tree/master/seleniumbase/plugins) for logging [data & screenshots](https://github.com/seleniumbase/SeleniumBase/tree/master/examples/example_logs).
 * Works with [Selenium Grid](https://github.com/seleniumbase/SeleniumBase/tree/master/integrations/selenium_grid), [MySQL](https://github.com/seleniumbase/SeleniumBase/blob/master/seleniumbase/core/testcase_manager.py), [Docker](https://github.com/seleniumbase/SeleniumBase/blob/master/integrations/docker/ReadMe.md), [NodeJS](https://github.com/seleniumbase/SeleniumBase/tree/master/integrations/node_js), [Google Cloud](https://github.com/seleniumbase/SeleniumBase/tree/master/integrations/google_cloud/ReadMe.md), and [AWS](#amazon_section).
@@ -95,25 +95,25 @@ class MyTestClass(BaseCase):
 ```bash
 cd examples/
 
-pytest my_first_test.py --with-selenium --browser=chrome
+pytest my_first_test.py --browser=chrome
 
-nosetests my_first_test.py --with-selenium --browser=firefox
+nosetests my_first_test.py --browser=firefox
 
-nosetests my_first_test.py --with-selenium --browser=phantomjs
+nosetests my_first_test.py --browser=phantomjs
 ```
 (<i>If no browser is specified, Chrome is used by default.</i>)
 
 <a id="seleniumbase_demo_mode"></a>
 If the example test is moving too fast for your eyes to see what's going on, you can run it in **Demo Mode** by adding ``--demo_mode`` on the command line, which pauses the browser briefly between actions, and highlights page elements being acted on:
 
 ```bash
-pytest my_first_test.py --with-selenium --browser=chrome --demo_mode
+pytest my_first_test.py --browser=chrome --demo_mode
 ```
 
 You can override the default wait time by either updating [settings.py](https://github.com/seleniumbase/SeleniumBase/blob/master/seleniumbase/config/settings.py) or by using ``--demo_sleep={NUM}`` when using Demo Mode. (NOTE: If you use ``--demo_sleep={NUM}`` without using ``--demo_mode``, nothing will happen.)
 
 ```bash
-nosetests my_first_test.py --with-selenium --browser=chrome --demo_mode --demo_sleep=1.2
+nosetests my_first_test.py --browser=chrome --demo_mode --demo_sleep=1.2
 ```
 
 You can also use the following in your scripts to slow down the tests:
@@ -130,7 +130,7 @@ You may also want to have your test sleep in other situations where you need to
 If you need to debug things on the fly (in case of errors), use this:
 
 ```bash
-nosetests my_first_test.py --browser=chrome --with-selenium --pdb --pdb-failures -s
+nosetests my_first_test.py --browser=chrome --pdb --pdb-failures -s
 ```
 
 The above code (with --pdb) will leave your browser window open in case there's a failure, which is possible if the web pages from the example change the data that's displayed on the page. (ipdb commands: 'c', 's', 'n' => continue, step, next). You may need the ``-s`` in order to see all console output.
@@ -179,7 +179,7 @@ pytest my_test_suite.py --html=report.html
 The ``--report`` option gives you a fancy report after your test suite completes. (Requires ``--with-testing_base`` to also be set when ``--report`` is used because it's part of that plugin.)
 
 ```bash
-nosetests my_test_suite.py --with-selenium --with-testing_base --report
+nosetests my_test_suite.py --with-testing_base --report
 ```
 ![](https://cdn2.hubspot.net/hubfs/100006/images/Test_Report_2.png "Example Nosetest Report")
 
@@ -208,7 +208,7 @@ Here are some things you can do to setup a production environment for your testi
 
 Here's an example of running tests with additional features enabled:
 ```bash
-nosetests [YOUR_TEST_FILE].py --browser=chrome --with-selenium --with-testing_base --with-db_reporting --with-s3_logging -s
+nosetests [YOUR_TEST_FILE].py --browser=chrome --with-testing_base --with-db_reporting --with-s3_logging -s
 ```
 (NOTE: If you haven't configured your MySQL or S3 connections in [settings.py](https://github.com/seleniumbase/SeleniumBase/blob/master/seleniumbase/config/settings.py), don't use ``--with-db_reporting`` or ``--with-s3_logging``.)
 
@@ -242,7 +242,7 @@ class MyTestClass(BaseCase):
 Now run it:
 
 ```bash
-nosetests test_fail.py --browser=chrome --with-selenium --with-testing_base
+nosetests test_fail.py --browser=chrome --with-testing_base
 ```
 
 You'll notice that a logs folder, "latest_logs", was created to hold information about the failing test, and screenshots. Take a look at what you get. Remember, this data can be saved in your MySQL DB and in S3 if you include the necessary plugins in your run command (and if you set up the neccessary connections properly). For future test runs, past test results will get stored in the archived_logs folder if you have ARCHIVE_EXISTING_LOGS set to True in [settings.py](https://github.com/seleniumbase/SeleniumBase/blob/master/seleniumbase/config/settings.py).

examples/ReadMe.md

@@ -12,7 +12,7 @@ python gui_test_runner.py
 
 (NOTE: You can interchange ``nosetests`` with ``pytest`` in most of these examples.)
 
-![](http://cdn2.hubspot.net/hubfs/100006/images/GUI_Test_Runner_5.png "GUI Test Runner")
+![](https://cdn2.hubspot.net/hubfs/100006/images/GUI_Test_Runner_7.png "GUI Test Runner")
 
 If you run scripts with logging enabled, (using ``--with-testing_base``), you’ll see two folders appear: “latest_logs” and “archived_logs”. The “latest_logs” folder will contain log files from the most recent test run, but logs will only be created if the test run is failing. Afterwards, logs from the “latest_logs” folder will get pushed to the “archived_logs” folder if you have have the ``ARCHIVE_EXISTING_LOGS`` feature enabled in [settings.py](https://github.com/seleniumbase/SeleniumBase/blob/master/seleniumbase/config/settings.py).
 
@@ -40,17 +40,17 @@ pytest my_first_test.py --browser=chrome --demo_mode
 
 Run the example test suite in Chrome and generate an html report: (nosetests-only)
 ```bash
-nosetests my_test_suite.py --with-selenium --browser=chrome --with-testing_base --report
+nosetests my_test_suite.py --browser=chrome --with-testing_base --report
 ```
 
 Run the example test suite in Firefox and generate an html report: (nosetests-only)
 ```bash
-nosetests my_test_suite.py --with-selenium --browser=firefox --with-testing_base --report
+nosetests my_test_suite.py --browser=firefox --with-testing_base --report
 ```
 
 Run the example test suite in PhantomJS and generate an html report: (nosetests-only)
 ```bash
-nosetests my_test_suite.py --with-selenium --browser=phantomjs --with-testing_base --report
+nosetests my_test_suite.py --browser=phantomjs --with-testing_base --report
 ```
 
 Run a test with configuration specifed by a config file:
@@ -65,12 +65,12 @@ nosetests rate_limiting_test.py
 
 Run a failing test with pdb mode enabled: (If a test failure occurs, test enters pdb mode)
 ```bash
-nosetests test_fail.py --browser=chrome --with-selenium --pdb --pdb-failures
+nosetests test_fail.py --browser=chrome --pdb --pdb-failures
 ```
 
 Run a failing test with logging:
 ```bash
-pytest test_fail.py --browser=chrome --with-testing_base --with-basic_test_info --with-page_source --with-screen_shots
+pytest test_fail.py --browser=chrome --with-testing_base
 ```
 
 (NOTE: If you see any ``*.pyc`` files appear as you run tests, that's perfectly normal. Compiled bytecode is a natural result of running Python code.)

examples/boilerplates/samples/google_test.py

@@ -14,6 +14,5 @@ def test_google_dot_com(self):
         self.assert_element(HomePage.feeling_lucky_button)
         self.update_text(HomePage.search_box, "github\n")
         self.assert_text("github.com", ResultsPage.search_results)
-        self.assert_element(ResultsPage.google_logo)
         self.click_link_text("Images")
         self.assert_element('img[alt="Image result for github"]')

examples/gui_test_runner.py

@@ -24,92 +24,91 @@ def __init__(self, master):
             frame, text="Basic Test Run in Chrome:", fg="blue").pack()
         self.run1 = Button(
             frame, command=self.run_1,
-            text=("pytest my_first_test.py --with-selenium"
+            text=("pytest my_first_test.py"
                   " --browser=chrome")).pack()
         self.title2 = Label(
             frame, text="Basic Test Run in Firefox:", fg="blue").pack()
         self.run2 = Button(
             frame, command=self.run_2,
             text=("pytest my_first_test.py"
-                  " --with-selenium --browser=firefox")).pack()
+                  " --browser=firefox")).pack()
         self.title3 = Label(
             frame, text="Basic Test Run in Demo Mode:", fg="blue").pack()
         self.run3 = Button(
             frame, command=self.run_3,
-            text=("nosetests my_first_test.py"
-                  " --with-selenium --browser=chrome --demo_mode")).pack()
+            text=("pytest my_first_test.py"
+                  " --browser=chrome --demo_mode")).pack()
         self.title4 = Label(
             frame,
             text="Basic Failing Test Run with Screenshots:",
             fg="blue").pack()
         self.run4 = Button(
             frame, command=self.run_4,
-            text=("nosetests test_fail.py --with-selenium --browser=chrome"
+            text=("nosetests test_fail.py --browser=chrome"
                   " --with-testing_base --demo_mode")).pack()
         self.title5 = Label(
             frame,
             text="Basic Failing Test Suite Run with Test Report:",
             fg="blue").pack()
         self.run5 = Button(
             frame, command=self.run_5,
-            text=("nosetests my_test_suite.py --with-selenium"
-                  " --browser=chrome --with-testing_base "
-                  "--report --show_report")).pack()
+            text=("nosetests my_test_suite.py --with-testing_base"
+                  " --report --show_report")).pack()
         self.title6 = Label(
             frame,
             text="Basic Failing Test Run showing the Multiple-Checks feature:",
             fg="blue").pack()
         self.run6 = Button(
             frame, command=self.run_6,
             text=("nosetests non_terminating_checks_test.py"
-                  " --browser=chrome --with-selenium")).pack()
+                  " --browser=chrome")).pack()
         self.title7 = Label(
             frame,
-            text="MySQL DB Reporting Tests: (See ReadMe.md for Setup Steps!)",
+            text="Use MySQL DB Reporting: (See ReadMe.md for Setup Steps!)",
             fg="blue").pack()
         self.run7 = Button(
             frame, command=self.run_7,
-            text=("nosetests my_test_suite.py --with-selenium"
+            text=("nosetests my_test_suite.py"
                   " --browser=chrome --with-db_reporting")).pack()
         self.end_title = Label(frame, text="", fg="black").pack()
         self.quit = Button(frame, text="QUIT", command=frame.quit).pack()
 
     def run_1(self):
         os.system(
-            'pytest my_first_test.py --with-selenium --browser=chrome')
+            'pytest my_first_test.py --browser=chrome')
 
     def run_2(self):
         os.system(
-            'pytest my_first_test.py --with-selenium --browser=firefox')
+            'pytest my_first_test.py --browser=firefox')
 
     def run_3(self):
         os.system(
-            'nosetests my_first_test.py --with-selenium --demo_mode'
+            'pytest my_first_test.py --demo_mode'
             ' --browser=chrome')
 
     def run_4(self):
         os.system(
-            'nosetests test_fail.py --with-selenium'
+            'nosetests test_fail.py'
             ' --browser=chrome --with-testing_base --demo_mode')
 
     def run_5(self):
         os.system(
-            'nosetests my_test_suite.py --with-selenium'
-            ' --browser=chrome --with-testing_base --report --show_report')
+            'nosetests my_test_suite.py'
+            ' --with-testing_base --report --show_report')
 
     def run_6(self):
         os.system(
-            'nosetests non_terminating_checks_test.py --with-selenium'
+            'nosetests non_terminating_checks_test.py'
             ' --browser=chrome')
 
     def run_7(self):
         os.system(
-            'nosetests my_test_suite.py --with-selenium'
+            'nosetests my_test_suite.py'
             ' --browser=chrome --with-db_reporting')
 
 
 if __name__ == "__main__":
     root = Tk()
-    root.minsize(700, 444)
+    root.minsize(560, 444)
     app = App(root)
     root.mainloop()

examples/run_my_first_test_in_chrome.sh

@@ -1 +1 @@
-nosetests my_first_test.py --browser=chrome --with-selenium --logging-level=INFO -s
+nosetests my_first_test.py --browser=chrome --logging-level=INFO -s

examples/run_my_first_test_in_firefox.sh

@@ -1 +1 @@
-nosetests my_first_test.py --browser=firefox --with-selenium --logging-level=INFO -s
+nosetests my_first_test.py --browser=firefox --logging-level=INFO -s

examples/run_test_fail_with_logging.sh

@@ -1 +1 @@
-nosetests test_fail.py --with-selenium --with-testing_base --with-basic_test_info --with-page_source --with-screen_shots
+nosetests test_fail.py --with-testing_base

integrations/google_cloud/ReadMe.md

@@ -84,19 +84,19 @@ sudo python server_setup.py develop
 ![](http://cdn2.hubspot.net/hubfs/100006/images/gcp_bitnami.png "Linux SSH Terminal")
 
 ```bash
-py.test examples/my_first_test.py --with-selenium --headless --browser=chrome
+pytest examples/my_first_test.py --headless --browser=chrome
 ```
 
 #### Step 14. If you like nosetests better than pytest, that works too
 
 ```bash
-nosetests examples/my_first_test.py --with-selenium --headless --browser=chrome
+nosetests examples/my_first_test.py --headless --browser=chrome
 ```
 
 #### Step 15. You can also verify that the example test runs on Firefox
 
 ```bash
-nosetests examples/my_first_test.py --with-selenium --headless --browser=firefox
+nosetests examples/my_first_test.py --headless --browser=firefox
 ```
 
 #### Step 16. Login to Jenkins
@@ -119,7 +119,7 @@ nosetests examples/my_first_test.py --with-selenium --headless --browser=firefox
 * Under "Build", click the "Add build step" dropdown and then select "Execute shell".
 * For the "Command", put:
 ```bash
-nosetests examples/my_first_test.py --with-selenium --headless --browser=chrome
+nosetests examples/my_first_test.py --headless --browser=chrome
 ```
 * Click "Save" when you're done.
 
@@ -184,7 +184,7 @@ sudo python setup.py install
 * For the "Execute shell", use the following as your updated "Command":
 
 ```bash
-nosetests examples/my_test_suite.py --with-selenium --headless --browser=chrome --with-db_reporting --with-testing_base
+nosetests examples/my_test_suite.py --headless --browser=chrome --with-db_reporting --with-testing_base
 ```
 
 * Click "Save" when you're done.

integrations/selenium_grid/ReadMe.md

@@ -1,11 +1,48 @@
-""" Download the selenium server jar file """
+""" Downloads the Selenium Server JAR file and renames it. """
 
 import os
-from seleniumbase.core import selenium_launcher
+import sys
+import urllib
 
-if not selenium_launcher.is_available_locally():
-    selenium_launcher.download_selenium()
+SELENIUM_JAR = ("http://selenium-release.storage.googleapis.com"
+                "/2.53/selenium-server-standalone-2.53.0.jar")
+JAR_FILE = "selenium-server-standalone-2.53.0.jar"
+try:
+    import selenium
+    if selenium.__version__[0] == '3':
+        SELENIUM_JAR = ("http://selenium-release.storage.googleapis.com"
+                        "/3.8/selenium-server-standalone-3.8.1.jar")
+        JAR_FILE = "selenium-server-standalone-3.8.1.jar"
+except Exception:
+    pass
 
-for filename in os.listdir("."):
-    if filename.startswith("selenium-server-standalone-"):
-        os.rename(filename, "selenium-server-standalone.jar")
+RENAMED_JAR_FILE = "selenium-server-standalone.jar"
+
+
+def download_selenium():
+    """
+    Downloads the Selenium Server JAR file from its
+    online location and stores it locally.
+    """
+    try:
+        local_file = open(JAR_FILE, 'wb')
+        remote_file = urllib.urlopen(SELENIUM_JAR)
+        print('Downloading Selenium Server JAR File...\n')
+        local_file.write(remote_file.read())
+        local_file.close()
+        remote_file.close()
+        print('Download Complete!\n')
+    except Exception:
+        raise Exception("Error downloading the Selenium Server JAR file.\n"
+                        "Details: %s" % sys.exc_info()[1])
+
+
+def is_available_locally():
+    return os.path.isfile(RENAMED_JAR_FILE)
+
+
+if not is_available_locally():
+    download_selenium()
+    for filename in os.listdir("."):
+        if filename.startswith("selenium-server-standalone-"):
+            os.rename(filename, RENAMED_JAR_FILE)

integrations/selenium_grid/download_selenium.py

@@ -21,7 +21,7 @@ fi
 ################################################################################
 
 WEBDRIVER_SERVER_JAR=./selenium-server-standalone.jar
-WEBDRIVER_NODE_PARAMS="-role webdriver -hubHost 127.0.0.1 -hubPort 4444 -host 127.0.0.1 -browserName=firefox"
+WEBDRIVER_NODE_PARAMS="-role webdriver -hubHost 127.0.0.1 -hubPort 4444 -host 127.0.0.1 -browser browserName=firefox,maxInstances=5,version=ANY,platform=ANY -browser browserName=chrome,maxInstances=5,version=ANY,platform=ANY"
 WEBDRIVER_NODE_PIDFILE="/tmp/webdriver_node.pid"
 
 if [ ! -f $WEBDRIVER_SERVER_JAR ]; then

integrations/selenium_grid/grid-node

@@ -0,0 +1,2 @@
+cd c:\
+java -jar selenium-server-standalone.jar -role node -hub http://localhost:4444/grid/register -browser browserName=chrome,maxInstances=5,version=ANY,platform=ANY -browser browserName=firefox,maxInstances=5,version=ANY,platform=ANY -browser browserName="internet explorer",maxInstances=1,version=ANY,platform=ANY

integrations/selenium_grid/register-node.bat

@@ -0,0 +1,2 @@
+#!/bin/bash
+java -jar selenium-server-standalone.jar -role node -hub http://localhost:4444/grid/register -browser browserName=chrome,maxInstances=5,version=ANY,platform=ANY -browser browserName=firefox,maxInstances=5,version=ANY,platform=ANY

integrations/selenium_grid/register-node.sh

@@ -0,0 +1,2 @@
+cd c:\
+java -jar selenium-server-standalone.jar -role hub

integrations/selenium_grid/selenium_server_config_example.cfg

@@ -1,5 +1,5 @@
 pip>=9.0.1
-setuptools>=38.2.4
+setuptools>=38.5.1
 ipython==5.4.1
 selenium==3.8.0
 nose==1.3.7

integrations/selenium_grid/start-selenium-node.bat

@@ -70,7 +70,7 @@
 to be True since it's part of wait_for_ready_state_complete().
 '''
 # Called after each wait_for_ready_state_complete()
-WAIT_FOR_ANGULARJS = False
+WAIT_FOR_ANGULARJS = True
 
 # Option to start Chrome in full screen mode by default
 START_CHROME_IN_FULL_SCREEN_MODE = False