Skip to content

Commit 5ab9dff

Browse files
authored
Merge pull request #883 from seleniumbase/new-methods-and-commands
New methods and commands
2 parents fcf234f + 0db7ba2 commit 5ab9dff

35 files changed

+820
-169
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ COMMANDS:
142142
mkdir [DIRECTORY] [OPTIONS]
143143
mkfile [FILE.py] [OPTIONS]
144144
mkpres [FILE.py] [LANG]
145+
mkchart [FILE.py] [LANG]
145146
print [FILE] [OPTIONS]
146147
translate [SB_FILE.py] [LANG] [ACTION]
147148
convert [WEBDRIVER_UNITTEST_FILE.py]

docs/requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ tqdm>=4.60.0
33
livereload==2.6.3;python_version>="3.6"
44
joblib==1.0.1;python_version>="3.6"
55
Markdown==3.3.4
6-
docutils==0.17
6+
docutils==0.17.1
77
Jinja2==2.11.3
88
readme-renderer==29.0
99
pymdown-extensions==8.1.1
10-
importlib-metadata==3.10.1;python_version>="3.6"
10+
importlib-metadata==4.0.1;python_version>="3.6"
1111
lunr==0.5.8
1212
mkdocs==1.1.2
13-
mkdocs-material==7.1.1
14-
mkdocs-exclude-search==0.4.0
13+
mkdocs-material==7.1.2
14+
mkdocs-exclude-search==0.5.1;python_version>="3.6"
1515
mkdocs-simple-hooks==0.1.3
1616
mkdocs-material-extensions==1.0.1
1717
mkdocs-minify-plugin==0.4.0

examples/chart_maker/ReadMe.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Here are screenshots from the examples:
5353
<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>
5454

5555

56-
<h3><img src="https://seleniumbase.io/img/sb_icon.png" title="SeleniumBase" width="24" /> Here's a line chart example:</h3>
56+
<h3><img src="https://seleniumbase.io/img/logo6.png" title="SeleniumBase" width="32" /> Here's a line chart example:</h3>
5757

5858
```python
5959
from seleniumbase import BaseCase
@@ -83,7 +83,7 @@ pytest test_line_chart.py
8383
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.)
8484

8585

86-
<h3><img src="https://seleniumbase.io/img/sb_icon.png" title="SeleniumBase" width="24" /> For a more advanced example (multiple charts in a presentation):</h3>
86+
<h3><img src="https://seleniumbase.io/img/logo6.png" title="SeleniumBase" width="32" /> For a more advanced example (multiple charts in a presentation):</h3>
8787

8888
```python
8989
from seleniumbase import BaseCase
@@ -99,19 +99,19 @@ class MyChartMakerClass(BaseCase):
9999
self.add_data_point("Failed", 1, color="#f1888f")
100100
self.add_slide("<p>Pie Chart</p>" + self.extract_chart())
101101

102-
self.create_bar_chart(title="Language", libs=False)
102+
self.create_bar_chart(title="Language")
103103
self.add_data_point("Python", 33, color="Orange")
104104
self.add_data_point("JavaScript", 27, color="Teal")
105105
self.add_data_point("HTML + CSS", 21, color="Purple")
106106
self.add_slide("<p>Bar Chart</p>" + self.extract_chart())
107107

108-
self.create_column_chart(title="Colors", libs=False)
108+
self.create_column_chart(title="Colors")
109109
self.add_data_point("Red", 10, color="Red")
110110
self.add_data_point("Green", 25, color="Green")
111111
self.add_data_point("Blue", 15, color="Blue")
112112
self.add_slide("<p>Column Chart</p>" + self.extract_chart())
113113

114-
self.create_line_chart(title="Last Week's Data", libs=False)
114+
self.create_line_chart(title="Last Week's Data")
115115
self.add_data_point("Sun", 5)
116116
self.add_data_point("Mon", 10)
117117
self.add_data_point("Tue", 20)
@@ -138,7 +138,7 @@ pytest chart_presentation.py
138138
Multi-Series charts can also be created. Try the available examples to learn more.
139139

140140

141-
<h2><img src="https://seleniumbase.io/img/sb_icon.png" title="SeleniumBase" width="24" /> ChartMaker API</h2>
141+
<h2><img src="https://seleniumbase.io/img/logo6.png" title="SeleniumBase" width="32" /> ChartMaker API</h2>
142142

143143
```python
144144
self.create_pie_chart(
@@ -260,7 +260,7 @@ self.create_area_chart(
260260
If creating multiple charts at the same time, you can pass the ``chart_name`` parameter to distinguish between different charts.
261261

262262

263-
<h3><img src="https://seleniumbase.io/img/sb_icon.png" title="SeleniumBase" width="24" /> Adding a data point to a chart:</h3>
263+
<h3><img src="https://seleniumbase.io/img/logo6.png" title="SeleniumBase" width="32" /> Adding a data point to a chart:</h3>
264264

265265
```python
266266
self.add_data_point(label, value, color=None, chart_name=None):
@@ -277,7 +277,7 @@ self.add_data_point(label, value, color=None, chart_name=None):
277277
```
278278

279279

280-
<h3><img src="https://seleniumbase.io/img/sb_icon.png" title="SeleniumBase" width="24" /> Adding a new data series to an existing chart:</h3>
280+
<h3><img src="https://seleniumbase.io/img/logo6.png" title="SeleniumBase" width="32" /> Adding a new data series to an existing chart:</h3>
281281

282282
```python
283283
self.add_series_to_chart(self, data_name=None, chart_name=None):
@@ -291,7 +291,7 @@ self.add_series_to_chart(self, data_name=None, chart_name=None):
291291
```
292292

293293

294-
<h3><img src="https://seleniumbase.io/img/sb_icon.png" title="SeleniumBase" width="24" /> Saving a chart to a file:</h3>
294+
<h3><img src="https://seleniumbase.io/img/logo6.png" title="SeleniumBase" width="32" /> Saving a chart to a file:</h3>
295295

296296
```python
297297
self.save_chart(chart_name=None, filename=None):
@@ -307,7 +307,7 @@ self.save_chart(chart_name=None, filename=None):
307307
The full HTML of the chart is saved to the ``saved_charts/`` folder.
308308

309309

310-
<h3><img src="https://seleniumbase.io/img/sb_icon.png" title="SeleniumBase" width="24" /> Extracting the HTML of a chart:</h3>
310+
<h3><img src="https://seleniumbase.io/img/logo6.png" title="SeleniumBase" width="32" /> Extracting the HTML of a chart:</h3>
311311

312312
```python
313313
self.extract_chart(chart_name=None):
@@ -319,7 +319,7 @@ self.extract_chart(chart_name=None):
319319
```
320320

321321

322-
<h3><img src="https://seleniumbase.io/img/sb_icon.png" title="SeleniumBase" width="24" /> Displaying a chart in the browser window:</h3>
322+
<h3><img src="https://seleniumbase.io/img/logo6.png" title="SeleniumBase" width="32" /> Displaying a chart in the browser window:</h3>
323323

324324
```python
325325
self.display_chart(chart_name=None, filename=None):

examples/chart_maker/chart_presentation.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ def test_chart_maker_presentation(self):
1212
self.add_data_point("Failed", 1, color="#f1888f")
1313
self.add_slide("<p>Pie Chart</p>" + self.extract_chart())
1414

15-
self.create_bar_chart(title="Language", libs=False, legend=False)
15+
self.create_bar_chart(title="Language", legend=False)
1616
self.add_data_point("Python", 33, color="Orange")
1717
self.add_data_point("JavaScript", 27, color="Teal")
1818
self.add_data_point("HTML + CSS", 21, color="Purple")
1919
self.add_slide("<p>Bar Chart</p>" + self.extract_chart())
2020

21-
self.create_column_chart(title="Colors", libs=False, legend=False)
21+
self.create_column_chart(title="Colors", legend=False)
2222
self.add_data_point("Red", 10, color="Red")
2323
self.add_data_point("Green", 25, color="Green")
2424
self.add_data_point("Blue", 15, color="Blue")
2525
self.add_slide("<p>Column Chart</p>" + self.extract_chart())
2626

27-
self.create_line_chart(title="Last Week's Data", libs=False)
27+
self.create_line_chart(title="Last Week's Data")
2828
self.add_data_point("Sun", 5)
2929
self.add_data_point("Mon", 10)
3030
self.add_data_point("Tue", 20)

examples/chart_maker/test_save_chart.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ def test_save_chart(self):
1010
self.add_data_point("Failed", 1, color="#f1888f")
1111
self.save_chart(filename="pie_chart.html")
1212

13-
self.create_bar_chart(title="Bar Chart", libs=False)
13+
self.create_bar_chart(title="Bar Chart")
1414
self.add_data_point("Python", 33, color="Orange")
1515
self.add_data_point("JavaScript", 27, color="Teal")
1616
self.add_data_point("HTML + CSS", 21, color="Purple")
1717
self.save_chart(filename="bar_chart.html")
1818

19-
self.create_column_chart(title="Column Chart", libs=False)
19+
self.create_column_chart(title="Column Chart")
2020
self.add_data_point("Red", 10, color="Red")
2121
self.add_data_point("Green", 25, color="Green")
2222
self.add_data_point("Blue", 15, color="Blue")
2323
self.save_chart(filename="column_chart.html")
2424

25-
self.create_line_chart(title="Line Chart", libs=False)
25+
self.create_line_chart(title="Line Chart")
2626
self.add_data_point("Sun", 5)
2727
self.add_data_point("Mon", 10)
2828
self.add_data_point("Tue", 20)

examples/migration/__init__.py

Whitespace-only changes.

examples/migration/protractor/ReadMe.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88

99
```bash
1010
$ pytest --rs -v --guest
11-
# ======================== test session starts ======================== #
11+
========================== test session starts ==========================
1212
platform darwin -- Python 3.9.2, pytest-6.2.3, py-1.10.0, pluggy-0.13.1
13-
metadata: {'Python': '3.9.2', 'Platform': 'macOS-10.14.6-x86_64-i386-64bit', 'Packages': {'pytest': '6.2.3', 'py': '1.10.0', 'pluggy': '0.13.1'}, 'Plugins': {'html': '2.0.1', 'rerunfailures': '9.1.1', 'xdist': '2.2.1', 'metadata': '1.11.0', 'ordering': '0.6', 'forked': '1.3.0', 'seleniumbase': '1.59.6'}}
13+
metadata: {'Python': '3.9.2', 'Platform': 'macOS-10.14.6-x86_64-i386-64bit', 'Packages': {'pytest': '6.2.3', 'py': '1.10.0', 'pluggy': '0.13.1'}, 'Plugins': {'html': '2.0.1', 'rerunfailures': '9.1.1', 'xdist': '2.2.1', 'metadata': '1.11.0', 'ordering': '0.6', 'forked': '1.3.0', 'seleniumbase': '1.62.0'}}
1414
rootdir: /Users/michael/github/SeleniumBase/examples, configfile: pytest.ini
15-
plugins: html-2.0.1, rerunfailures-9.1.1, xdist-2.2.1, metadata-1.11.0, ordering-0.6, forked-1.3.0, seleniumbase-1.59.6
15+
plugins: html-2.0.1, rerunfailures-9.1.1, xdist-2.2.1, metadata-1.11.0, ordering-0.6, forked-1.3.0, seleniumbase-1.62.0
1616
collected 4 items
1717

1818
example_test.py::AngularJSHomePageTests::test_greet_user PASSED
1919
example_test.py::AngularJSHomePageTests::test_todo_list PASSED
2020
input_test.py::AngularMaterialInputTests::test_invalid_input PASSED
2121
mat_paginator_test.py::AngularMaterialPaginatorTests::test_pagination PASSED
2222

23-
# ======================== 4 passed in 10.16s ======================== #
23+
========================== 4 passed in 10.34s ==========================
2424
```

examples/migration/protractor/__init__.py

Whitespace-only changes.

examples/migration/protractor/example_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class AngularJSHomePageTests(BaseCase):
66
def test_greet_user(self):
77
self.open("http://www.angularjs.org")
88
self.type('[ng-model="yourName"]', "Julie")
9-
self.assert_text("Hello Julie!", "h1.ng-binding")
9+
self.assert_exact_text("Hello Julie!", "h1.ng-binding")
1010

1111
def test_todo_list(self):
1212
self.open("http://www.angularjs.org")

examples/migration/protractor/mat_paginator_test.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ def test_pagination(self):
88
self.assert_element(".mat-button-wrapper > .mat-icon")
99
# Verify navigation to the next page
1010
self.click('button[aria-label="Next page"]')
11-
self.assert_text("11 – 20 of 100", ".mat-paginator-range-label")
11+
self.assert_exact_text("11 – 20 of 100", ".mat-paginator-range-label")
1212
# Verify navigation to the previous page
1313
self.click('button[aria-label="Previous page"]')
14-
self.assert_text("1 – 10 of 100", ".mat-paginator-range-label")
14+
self.assert_exact_text("1 – 10 of 100", ".mat-paginator-range-label")
1515
# Verify changed list length to 5 items per page
1616
self.click("mat-select > div")
1717
self.click("mat-option > .mat-option-text")
18-
self.assert_text("1 – 5 of 100", ".mat-paginator-range-label")
18+
self.assert_exact_text("1 – 5 of 100", ".mat-paginator-range-label")

0 commit comments

Comments
 (0)