Merge pull request #9 from mdmintz/integrations-organization

Integrations Organization

Author: mdmintz

Docker_README.md

@@ -94,8 +94,8 @@ RUN exec "$@"
 #=====================
 # Set up SeleniumBase
 #=====================
-COPY docker/docker_requirements.txt /SeleniumBase/
-COPY docker/docker_setup.py /SeleniumBase/
+COPY integrations/docker/docker_requirements.txt /SeleniumBase/
+COPY integrations/docker/docker_setup.py /SeleniumBase/
 COPY seleniumbase /SeleniumBase/seleniumbase/
 COPY examples /SeleniumBase/examples/
 RUN cd /SeleniumBase && ls && sudo pip install -r docker_requirements.txt
@@ -104,9 +104,9 @@ RUN cd /SeleniumBase && ls && sudo python docker_setup.py install
 #==========================================
 # Create entrypoint and grab example tests
 #==========================================
-COPY docker/docker-entrypoint.sh /
-COPY docker/run_docker_test_in_firefox.sh /
-COPY docker/run_docker_test_in_chrome.sh /
-COPY docker/docker_config.cfg /SeleniumBase/examples/
+COPY integrations/docker/docker-entrypoint.sh /
+COPY integrations/docker/run_docker_test_in_firefox.sh /
+COPY integrations/docker/run_docker_test_in_chrome.sh /
+COPY integrations/docker/docker_config.cfg /SeleniumBase/examples/
 ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD ["/bin/bash"]

Dockerfile

@@ -13,7 +13,7 @@
 
 ### Part I: MAC SETUP INSTRUCTIONS
 ####(WINDOWS users: You'll need to make a few modifications to the setup steps listed here. For starters, you won't be able to use the "brew install" command since that's MAC-only. Instead, download the requirements mentioned directly from the web. I'll provide you with links to save you time. You'll also want to put downloaded files into your [PATH](http://java.com/en/download/help/path.xml).)
-####(DOCKER users: If you want to run browser automation with Docker, see the [Docker_README](https://github.com/mdmintz/SeleniumBase/blob/master/Docker_README.md))
+####(DOCKER users: If you want to run browser automation with Docker, see the [Docker ReadMe](https://github.com/mdmintz/SeleniumBase/blob/master/integrations/docker/ReadMe.md))
 
 #### **Step 0:** Get the requirements
 
@@ -263,7 +263,7 @@ If you're planning on using the full power of this test framework, there are a f
 
 * Install [MySQL Workbench](http://dev.mysql.com/downloads/tools/workbench/) to make life easier by giving you a nice GUI tool that you can use to read & write from your DB directly.
 
-* Setup your Selenium Grid and update your *.cfg file to point there. An example config file called selenium_server_config_example.cfg has been provided for you in the grid folder. The start-selenium-node.bat and start-selenium-server.sh files are for running your grid. In an example situation, your Selenium Grid server might live on a unix box and your Selenium Grid nodes might live on EC2 Windows virtual machines. When your build server runs a Selenium test, it would connect to your Selenium Grid to find out which Grid browser nodes are available to run that test. To simplify things, you can use [Browser Stack](https://www.browserstack.com/automate) as your entire Selenium Grid (and let them do all the fun work of maintaining the grid for you).
+* Setup your Selenium Grid and update your *.cfg file to point there. An example config file called selenium_server_config_example.cfg has been provided for you in the integrations/selenium_grid folder. The start-selenium-node.bat and start-selenium-server.sh files are for running your grid. In an example situation, your Selenium Grid server might live on a unix box and your Selenium Grid nodes might live on EC2 Windows virtual machines. When your build server runs a Selenium test, it would connect to your Selenium Grid to find out which Grid browser nodes are available to run that test. To simplify things, you can use [Browser Stack](https://www.browserstack.com/automate) as your entire Selenium Grid (and let them do all the fun work of maintaining the grid for you).
 
 * There are ways of running your tests from Jenkins without having to utilize a remote machine. One way is by using PhantomJS as your browser (it runs headlessly). Another way is by using Xvfb (another headless system). [There's a plugin for Xvfb in Jenkins](https://wiki.jenkins-ci.org/display/JENKINS/Xvfb+Plugin).
 If you have Xvfb running in the background, you can add ``--headless`` to your run command in order to utilize it.

README.md

@@ -24,10 +24,10 @@ cd /
 sudo git clone https://github.com/mdmintz/SeleniumBase.git
 ```
 
-#### 5. Enter the "google_cloud" folder
+#### 5. Enter the "linux" folder
 
 ```bash
-cd SeleniumBase/integrations/google_cloud/
+cd SeleniumBase/integrations/linux/
 ```
 
 #### 6. Give Jenkins (aka "tomcat" user) sudo access