Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions help_docs/ReadMe.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
## Additional Help Documents
### ![http://seleniumbase.com](https://cdn2.hubspot.net/hubfs/100006/images/super_logo_tiny.png "SeleniumBase") SeleniumBase Help Documents:

This folder contains additional documents to help guide you with requirements installation, setup, and more.
> **Table of Contents / Navigation:**
> - [**SeleniumBase Features List**](https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/features_list.md)
> - [**How SeleniumBase Works**](https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/how_it_works.md)
> - [**Python & Webdriver Installation**](https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/before_installation.md)
> - [**Detailed Requirements Setup**](https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/requirements_installation.md)
> - [**Python Virtual Env Tutorial**](https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/virtualenv_instructions.md)
> - [**Verify Webdriver Installation**](https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/verify_webdriver.md)
> - [**The Command Line Tutorial**](https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/command_line.md)
> - [**SeleniumBase Method Summary**](https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/method_summary.md)
> - [**MySQL Installation Overview**](https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/mysql_installation.md)
> - [**Safari Driver Detailed Info**](https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/using_safari_driver.md)
> - [**Seeing Hidden Files on a Mac**](https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/hidden_files_info.md)
> - [**SeleniumBase Case Studies**](https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/happy_customers.md)
2 changes: 2 additions & 0 deletions help_docs/before_installation.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
## Before installing SeleniumBase, you need:

#### **Step 0a:** Setup your [![Python version](https://img.shields.io/badge/python-2.7,_3.*-22AADD.svg "Python version")](https://docs.python.org/2/) Python/pip environment:

* To install ``python``, ``pip``, ``git``, and either ``virtualenv`` or ``virtualenvwrapper``, **[follow these instructions](https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/requirements_installation.md)**.
Expand Down
2 changes: 2 additions & 0 deletions help_docs/hidden_files_info.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ Depending on your Mac settings, some files may be hidden from view in your Finde
```bash
defaults write com.apple.finder AppleShowAllFiles -bool true
```

More info on that **[here](https://www.defaults-write.com/show-hidden-files-in-os-x-finder/)**.
12 changes: 12 additions & 0 deletions seleniumbase/fixtures/base_case.py
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,8 @@ def get_text(self, selector, by=By.CSS_SELECTOR,
timeout=settings.SMALL_TIMEOUT):
if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
timeout = self._get_new_timeout(timeout)
if page_utils.is_xpath_selector(selector):
by = By.XPATH
self.wait_for_ready_state_complete()
time.sleep(0.01)
element = page_actions.wait_for_element_visible(
Expand All @@ -282,6 +284,8 @@ def get_attribute(self, selector, attribute, by=By.CSS_SELECTOR,
timeout=settings.SMALL_TIMEOUT):
if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
timeout = self._get_new_timeout(timeout)
if page_utils.is_xpath_selector(selector):
by = By.XPATH
self.wait_for_ready_state_complete()
time.sleep(0.01)
element = page_actions.wait_for_element_present(
Expand Down Expand Up @@ -332,6 +336,8 @@ def add_text(self, selector, new_value, by=By.CSS_SELECTOR,
Similar to update_text(), but won't clear the text field first. """
if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
timeout = self._get_new_timeout(timeout)
if page_utils.is_xpath_selector(selector):
by = By.XPATH
element = self.wait_for_element_visible(
selector, by=by, timeout=timeout)
self._demo_mode_highlight_if_active(selector, by)
Expand Down Expand Up @@ -371,6 +377,8 @@ def send_keys(self, selector, new_value, by=By.CSS_SELECTOR,
""" Same as add_text() -> more reliable, but less name confusion. """
if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
timeout = self._get_new_timeout(timeout)
if page_utils.is_xpath_selector(selector):
by = By.XPATH
self.add_text(selector, new_value, by=by, timeout=timeout)

def update_text_value(self, selector, new_value, by=By.CSS_SELECTOR,
Expand All @@ -385,6 +393,8 @@ def update_text_value(self, selector, new_value, by=By.CSS_SELECTOR,
"""
if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
timeout = self._get_new_timeout(timeout)
if page_utils.is_xpath_selector(selector):
by = By.XPATH
element = self.wait_for_element_visible(
selector, by=by, timeout=timeout)
self._demo_mode_highlight_if_active(selector, by)
Expand Down Expand Up @@ -441,6 +451,8 @@ def update_text(self, selector, new_value, by=By.CSS_SELECTOR,
We want to keep the old version for backward compatibility. """
if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
timeout = self._get_new_timeout(timeout)
if page_utils.is_xpath_selector(selector):
by = By.XPATH
self.update_text_value(selector, new_value, by=by,
timeout=timeout, retry=retry)

Expand Down
6 changes: 3 additions & 3 deletions server_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

setup(
name='seleniumbase',
version='1.4.11',
description='A framework for building test automation - seleniumbase.com',
long_description='A framework for building browser-based test automation',
version='1.4.12',
description='Web Automation & Testing Framework - http://seleniumbase.com',
long_description='Web Automation and Testing Framework - seleniumbase.com',
platforms='Mac * Windows * Linux * Docker',
url='http://seleniumbase.com',
author='Michael Mintz',
Expand Down
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
"""
The setup package to install SeleniumBase dependencies and plugins
(Uses the newer Selenium 3.6.0)
"""

import os
from setuptools import setup, find_packages # noqa

setup(
name='seleniumbase',
version='1.4.11',
description='A framework for building test automation - seleniumbase.com',
long_description='A framework for building browser-based test automation',
version='1.4.12',
description='Web Automation & Testing Framework - http://seleniumbase.com',
long_description='Web Automation and Testing Framework - seleniumbase.com',
platforms='Mac * Windows * Linux * Docker',
url='http://seleniumbase.com',
author='Michael Mintz',
Expand Down