Merge pull request #643 from seleniumbase/update-pytest-and-chart-maker

Upgrade pytest and Chart Maker

Author: mdmintz

examples/chart_maker/ReadMe.md

@@ -2,24 +2,58 @@
 
 # 📊 Chart Maker 📊
 
-SeleniumBase Chart Maker allows you to create HTML charts with Python.<br />
-The HighCharts library is used for creating charts.
+SeleniumBase Chart Maker allows you to create HTML charts with Python. (The HighCharts library is used for creating charts.)
 
-**Here's a sample chart:**
+**Here's a sample pie chart:**
 
 <a href="https://seleniumbase.io/other/chart_presentation.html"><img width="500" src="https://seleniumbase.io/other/sample_pie_chart.png" title="Screenshot"></a><br>
 
-([Click on the image for an actual chart demo](https://seleniumbase.io/other/chart_presentation.html))
+([Click to see a presentation with multiple charts](https://seleniumbase.io/other/chart_presentation.html))
 
-Here's how to run the example:
+Here's how to run an example presentation with a pie chart:
 
 ```bash
 cd examples/chart_maker
 pytest my_chart.py
 ```
 
+Here's the code for that pie chart presentation:
 
-### Creating a new chart:
+```python
+from seleniumbase import BaseCase
+
+class MyChartMakerClass(BaseCase):
+    def test_chart_maker(self):
+        self.create_presentation()
+        self.create_pie_chart(title="Automated Tests")
+        self.add_data_point("Passed", 7, color="#95d96f")
+        self.add_data_point("Untested", 2, color="#eaeaea")
+        self.add_data_point("Failed", 1, color="#f1888f")
+        self.add_slide("<p>Pie Chart</p>" + self.extract_chart())
+        self.begin_presentation(filename="my_chart.html")
+```
+
+Here's how to run an example presentation with multiple charts: (Press the right arrow to advance to the next slide)
+
+```bash
+cd examples/chart_maker
+pytest chart_presentation.py
+```
+
+Here are screenshots from the examples:
+
+<a href="https://seleniumbase.io/other/sample_column_chart.png"><img width="500" src="https://seleniumbase.io/other/sample_column_chart.png" title="Screenshot"></a><br>
+
+<a href="https://seleniumbase.io/other/sample_bar_chart.png"><img width="500" src="https://seleniumbase.io/other/sample_bar_chart.png" title="Screenshot"></a><br>
+
+<a href="https://seleniumbase.io/other/sample_line_chart.png"><img width="500" src="https://seleniumbase.io/other/sample_line_chart.png" title="Screenshot"></a><br>
+
+<a href="https://seleniumbase.io/other/sample_area_chart.png"><img width="500" src="https://seleniumbase.io/other/sample_area_chart.png" title="Screenshot"></a><br>
+
+<a href="https://seleniumbase.io/other/multi_series_chart.png"><img width="500" src="https://seleniumbase.io/other/multi_series_chart.png" title="Screenshot"></a><br>
+
+
+### Creating new charts:
 
 ```python
 self.create_pie_chart(
@@ -85,7 +119,28 @@ self.create_column_chart(
 self.create_line_chart(
     chart_name=None, title=None, subtitle=None,
     data_name=None, unit=None, zero=False, libs=True):
-""" Creates a JavaScript column chart using "HighCharts".
+""" Creates a JavaScript line chart using "HighCharts".
+    @Params
+    chart_name - If creating multiple charts,
+                 use this to select which one.
+    title - The title displayed for the chart.
+    subtitle - The subtitle displayed for the chart.
+    data_name - Set the series name. Useful for multi-series charts.
+    unit - The description label given to the chart's y-axis values.
+    zero - If True, the y-axis always starts at 0. (Default: False).
+    libs - The option to include Chart libraries (JS and CSS files).
+           Should be set to True (default) for the first time creating
+           a chart on a web page. If creating multiple charts on
+           a web page, you no longer need to re-import the libraries
+           when creating additional charts.
+"""
+```
+
+```python
+self.create_area_chart(
+    chart_name=None, title=None, subtitle=None,
+    data_name=None, unit=None, zero=False, libs=True):
+""" Creates a JavaScript area chart using "HighCharts".
     @Params
     chart_name - If creating multiple charts,
                  use this to select which one.
@@ -187,23 +242,29 @@ All methods have the optional ``chart_name`` argument, which is only needed if y
 from seleniumbase import BaseCase
 
 class MyChartMakerClass(BaseCase):
-
     def test_chart_maker(self):
         self.create_presentation()
-        self.create_pie_chart(title="Automated Tests")
-        self.add_data_point("Passed", 7, color="#95d96f")
-        self.add_data_point("Untested", 2, color="#eaeaea")
-        self.add_data_point("Failed", 1, color="#f1888f")
-        self.add_slide("<p>Pie Chart</p>" + self.extract_chart())
-        self.begin_presentation(filename="my_chart.html")
+        self.create_line_chart(
+            title="Time Outside", subtitle="Last Week", unit="Minutes")
+        self.add_data_point("Sun", 5)
+        self.add_data_point("Mon", 10)
+        self.add_data_point("Tue", 20)
+        self.add_data_point("Wed", 40)
+        self.add_data_point("Thu", 80)
+        self.add_data_point("Fri", 65)
+        self.add_data_point("Sat", 50)
+        self.add_slide("<p>Line Chart</p>" + self.extract_chart())
+        self.begin_presentation(filename="line_chart.html", interval=8)
 ```
 
-#### This example is from [my_chart.py](https://github.com/seleniumbase/SeleniumBase/blob/master/examples/chart_maker/my_chart.py), which you can run from the ``examples/chart_maker`` folder with the following command:
+#### This example is from [test_line_chart.py](https://github.com/seleniumbase/SeleniumBase/blob/master/examples/chart_maker/test_line_chart.py), which you can run from the ``examples/chart_maker`` folder with the following command:
 
 ```bash
-pytest my_chart.py
+pytest test_line_chart.py
 ```
 
+Because that presentation above has an ``interval`` set to ``8``, it will automatically advance to the next slide after 8 seconds. (Or exit if there are no more slides.)
+
 ### For a more advanced example (multiple charts in a presentation):
 
 ```python

examples/chart_maker/test_area_chart.py

@@ -0,0 +1,18 @@
+from seleniumbase import BaseCase
+
+
+class MyChartMakerClass(BaseCase):
+
+    def test_chart_maker(self):
+        self.create_presentation(theme="moon")
+        self.create_area_chart(
+            title="Time Outside", subtitle="Last Week", unit="Minutes")
+        self.add_data_point("Sun", 5)
+        self.add_data_point("Mon", 10)
+        self.add_data_point("Tue", 20)
+        self.add_data_point("Wed", 40)
+        self.add_data_point("Thu", 80)
+        self.add_data_point("Fri", 65)
+        self.add_data_point("Sat", 50)
+        self.add_slide("<p><b>Area Chart</b></p>" + self.extract_chart())
+        self.begin_presentation(filename="line_chart.html", interval=8)

examples/test_skype_site.py

@@ -21,7 +21,8 @@ def test_skype_website_on_mobile(self):
         self.highlight("div.appBannerContent")
         self.highlight('[itemprop="url"]')
         self.highlight("h1")
-        self.highlight_click('[title="Download Skype"]')
+        self.highlight('[title="Create a free meeting"]')
+        self.highlight_click('[data-bi-name="skype-download-home-page"]')
         self.assert_element('[aria-label="Microsoft"]')
         self.assert_text("Download Skype", "h1")
         self.highlight("div.appBannerContent")

help_docs/chart_maker.md

@@ -2,24 +2,58 @@
 
 # 📊 Chart Maker 📊
 
-SeleniumBase Chart Maker allows you to create HTML charts with Python.<br />
-The HighCharts library is used for creating charts.
+SeleniumBase Chart Maker allows you to create HTML charts with Python. (The HighCharts library is used for creating charts.)
 
-**Here's a sample chart:**
+**Here's a sample pie chart:**
 
 <a href="https://seleniumbase.io/other/chart_presentation.html"><img width="500" src="https://seleniumbase.io/other/sample_pie_chart.png" title="Screenshot"></a><br>
 
-([Click on the image for an actual chart demo](https://seleniumbase.io/other/chart_presentation.html))
+([Click to see a presentation with multiple charts](https://seleniumbase.io/other/chart_presentation.html))
 
-Here's how to run the example:
+Here's how to run an example presentation with a pie chart:
 
 ```bash
 cd examples/chart_maker
 pytest my_chart.py
 ```
 
+Here's the code for that pie chart presentation:
 
-### Creating a new chart:
+```python
+from seleniumbase import BaseCase
+
+class MyChartMakerClass(BaseCase):
+    def test_chart_maker(self):
+        self.create_presentation()
+        self.create_pie_chart(title="Automated Tests")
+        self.add_data_point("Passed", 7, color="#95d96f")
+        self.add_data_point("Untested", 2, color="#eaeaea")
+        self.add_data_point("Failed", 1, color="#f1888f")
+        self.add_slide("<p>Pie Chart</p>" + self.extract_chart())
+        self.begin_presentation(filename="my_chart.html")
+```
+
+Here's how to run an example presentation with multiple charts: (Press the right arrow to advance to the next slide)
+
+```bash
+cd examples/chart_maker
+pytest chart_presentation.py
+```
+
+Here are screenshots from the examples:
+
+<a href="https://seleniumbase.io/other/sample_column_chart.png"><img width="500" src="https://seleniumbase.io/other/sample_column_chart.png" title="Screenshot"></a><br>
+
+<a href="https://seleniumbase.io/other/sample_bar_chart.png"><img width="500" src="https://seleniumbase.io/other/sample_bar_chart.png" title="Screenshot"></a><br>
+
+<a href="https://seleniumbase.io/other/sample_line_chart.png"><img width="500" src="https://seleniumbase.io/other/sample_line_chart.png" title="Screenshot"></a><br>
+
+<a href="https://seleniumbase.io/other/sample_area_chart.png"><img width="500" src="https://seleniumbase.io/other/sample_area_chart.png" title="Screenshot"></a><br>
+
+<a href="https://seleniumbase.io/other/multi_series_chart.png"><img width="500" src="https://seleniumbase.io/other/multi_series_chart.png" title="Screenshot"></a><br>
+
+
+### Creating new charts:
 
 ```python
 self.create_pie_chart(
@@ -85,7 +119,28 @@ self.create_column_chart(
 self.create_line_chart(
     chart_name=None, title=None, subtitle=None,
     data_name=None, unit=None, zero=False, libs=True):
-""" Creates a JavaScript column chart using "HighCharts".
+""" Creates a JavaScript line chart using "HighCharts".
+    @Params
+    chart_name - If creating multiple charts,
+                 use this to select which one.
+    title - The title displayed for the chart.
+    subtitle - The subtitle displayed for the chart.
+    data_name - Set the series name. Useful for multi-series charts.
+    unit - The description label given to the chart's y-axis values.
+    zero - If True, the y-axis always starts at 0. (Default: False).
+    libs - The option to include Chart libraries (JS and CSS files).
+           Should be set to True (default) for the first time creating
+           a chart on a web page. If creating multiple charts on
+           a web page, you no longer need to re-import the libraries
+           when creating additional charts.
+"""
+```
+
+```python
+self.create_area_chart(
+    chart_name=None, title=None, subtitle=None,
+    data_name=None, unit=None, zero=False, libs=True):
+""" Creates a JavaScript area chart using "HighCharts".
     @Params
     chart_name - If creating multiple charts,
                  use this to select which one.
@@ -187,23 +242,29 @@ All methods have the optional ``chart_name`` argument, which is only needed if y
 from seleniumbase import BaseCase
 
 class MyChartMakerClass(BaseCase):
-
     def test_chart_maker(self):
         self.create_presentation()
-        self.create_pie_chart(title="Automated Tests")
-        self.add_data_point("Passed", 7, color="#95d96f")
-        self.add_data_point("Untested", 2, color="#eaeaea")
-        self.add_data_point("Failed", 1, color="#f1888f")
-        self.add_slide("<p>Pie Chart</p>" + self.extract_chart())
-        self.begin_presentation(filename="my_chart.html")
+        self.create_line_chart(
+            title="Time Outside", subtitle="Last Week", unit="Minutes")
+        self.add_data_point("Sun", 5)
+        self.add_data_point("Mon", 10)
+        self.add_data_point("Tue", 20)
+        self.add_data_point("Wed", 40)
+        self.add_data_point("Thu", 80)
+        self.add_data_point("Fri", 65)
+        self.add_data_point("Sat", 50)
+        self.add_slide("<p>Line Chart</p>" + self.extract_chart())
+        self.begin_presentation(filename="line_chart.html", interval=8)
 ```
 
-#### This example is from [my_chart.py](https://github.com/seleniumbase/SeleniumBase/blob/master/examples/chart_maker/my_chart.py), which you can run from the ``examples/chart_maker`` folder with the following command:
+#### This example is from [test_line_chart.py](https://github.com/seleniumbase/SeleniumBase/blob/master/examples/chart_maker/test_line_chart.py), which you can run from the ``examples/chart_maker`` folder with the following command:
 
 ```bash
-pytest my_chart.py
+pytest test_line_chart.py
 ```
 
+Because that presentation above has an ``interval`` set to ``8``, it will automatically advance to the next slide after 8 seconds. (Or exit if there are no more slides.)
+
 ### For a more advanced example (multiple charts in a presentation):
 
 ```python

help_docs/method_summary.md

@@ -383,6 +383,9 @@ self.create_column_chart(chart_name=None, title=None, subtitle=None,
 self.create_line_chart(chart_name=None, title=None, subtitle=None,
                        data_name=None, unit=None, zero=False, libs=True)
 
+self.create_area_chart(chart_name=None, title=None, subtitle=None,
+                       data_name=None, unit=None, zero=False, libs=True)
+
 self.add_series_to_chart(data_name=None, chart_name=None)
 
 self.add_data_point(label, value, color=None, chart_name=None)

requirements.txt

@@ -1,4 +1,4 @@
-pip>=20.1.1
+pip>=20.2
 packaging>=20.4
 setuptools>=44.1.1;python_version<"3.5"
 setuptools>=49.2.0;python_version>="3.5"
@@ -16,9 +16,10 @@ requests==2.24.0
 selenium==3.141.0
 pluggy==0.13.1
 attrs>=19.3.0
-py==1.8.1
+py==1.8.1;python_version<"3.5"
+py==1.9.0;python_version>="3.5"
 pytest==4.6.11;python_version<"3.5"
-pytest==5.4.3;python_version>="3.5"
+pytest==6.0.1;python_version>="3.5"
 pytest-cov==2.10.0
 pytest-forked==1.3.0
 pytest-html==1.22.1;python_version<"3.6"
@@ -41,10 +42,10 @@ colorama==0.4.3
 pymysql==0.10.0
 coverage==5.2.1
 brython>=3.8.9
-pyotp==2.3.0
+pyotp==2.4.0
 boto==2.49.0
 cffi==1.14.1
-rich==4.2.0;python_version>="3.6" and python_version<"4.0"
+rich==4.2.1;python_version>="3.6" and python_version<"4.0"
 flake8==3.7.9;python_version<"3.5"
 flake8==3.8.3;python_version>="3.5"
 pyflakes==2.1.1;python_version<"3.5"

seleniumbase/fixtures/base_case.py

@@ -3557,6 +3557,33 @@ def create_line_chart(
             chart_name=chart_name, title=title, subtitle=subtitle,
             style=style, data_name=data_name, unit=unit, zero=zero, libs=libs)
 
+    def create_area_chart(
+            self, chart_name=None, title=None, subtitle=None,
+            data_name=None, unit=None, zero=False, libs=True):
+        """ Creates a JavaScript area chart using "HighCharts".
+            @Params
+            chart_name - If creating multiple charts,
+                         use this to select which one.
+            title - The title displayed for the chart.
+            subtitle - The subtitle displayed for the chart.
+            data_name - Set the series name. Useful for multi-series charts.
+            unit - The description label given to the chart's y-axis values.
+            zero - If True, the y-axis always starts at 0. (Default: False).
+            libs - The option to include Chart libraries (JS and CSS files).
+                   Should be set to True (default) for the first time creating
+                   a chart on a web page. If creating multiple charts on
+                   a web page, you no longer need to re-import the libraries
+                   when creating additional charts.
+        """
+        if not chart_name:
+            chart_name = "default"
+        if not data_name:
+            data_name = ""
+        style = "area"
+        self.__create_highchart(
+            chart_name=chart_name, title=title, subtitle=subtitle,
+            style=style, data_name=data_name, unit=unit, zero=zero, libs=libs)
+
     def __create_highchart(
             self, chart_name=None, title=None, subtitle=None,
             style=None, data_name=None, unit=None, zero=False, libs=True):
@@ -3726,17 +3753,25 @@ def __create_highchart(
         if style != "pie":
             chart_init_3 = (
                 """
+                allowPointSelect: true,
+                cursor: 'pointer',
                 legend: {
                     layout: 'vertical',
                     align: 'right',
                     verticalAlign: 'middle'
                 },
+                states: {
+                    hover: {
+                        enabled: true
+                    }
+                },
                 plotOptions: {
                     series: {
                         showInLegend: true,
                         animation: true,
                         shadow: false,
                         lineWidth: 3,
+                        fillOpacity: 0.5,
                         marker: {
                             enabled: true
                         }