[prod]merge master to prod #151

Merged
merged 295 commits into from Nov 26, 2012

Projects

None yet
@bebef1987
Contributor

No description provided.

Bebe and others added some commits Apr 11, 2012
Bebe test_redirects f77fd0e
Bebe test_security a672cdd
@teodosia teodosia [webdriver]Migrated test_features.py and features.py to WebDriver 213a613
@stephendonner stephendonner Merge pull request #37 from bebef1987/test_redirects
Test redirects
cf76cb0
@stephendonner stephendonner Merge pull request #38 from bebef1987/test_security
Test security
13e2242
@stephendonner stephendonner Merge pull request #36 from bebef1987/test_performance
Test performance
6fd0d5e
@stephendonner stephendonner Merge pull request #39 from teodosia/wd-features
[webdriver]Migrated test_features.py and features.py to WebDriver
067ef49
@retornam retornam Merge pull request #35 from bebef1987/404
404 tests
5d7a139
@stephendonner stephendonner xfail test due to https://bugzilla.mozilla.org/show_bug.cgi?id=744671 2527eac
@retornam retornam Merge pull request #40 from stephendonner/webdriver
xfail x-robots-tag test due to bug 744671
65e87c0
@teodosia teodosia [Webdriver]Migrated test_customize.py and customize.py
Created a region menu_bar_billboard.py since it's used on most pages
and in this way we avoid a lot of code duplication.
778914a
@stupchiy stupchiy [webdriver] migrated test_aurora.py and aurora.py 64bf409
@stupchiy stupchiy [webdriver] migrated test_beta.py and beta.py d8d2952
@stephendonner stephendonner Updating one of the Areas of Interest strings. 3fc694b
@stephendonner stephendonner Adding in another missing string. e777730
@stephendonner stephendonner Fixing order of array, by putting "Other" after "Accessibility". 34a725a
Bebe TestDownload 8111529
@teodosia teodosia Removed extra spaces. ea1830e
@retornam retornam Merge pull request #45 from bebef1987/test_download
Test download
db144af
Bebe Test Channel fa37c63
@stephendonner

Isn't this the old way of marking xfails?

I thought we now do @pytest.mark.xfail -- also, it appears to be an unused import?

stupchiy and others added some commits Apr 23, 2012
@stupchiy stupchiy Merge branch 'webdriver' of https://github.com/mozilla/mcom-tests int…
…o wd-beta
ea8d021
@stupchiy stupchiy fixed Bebe comments 3728ea1
@stupchiy stupchiy Merge branch 'webdriver' of https://github.com/mozilla/mcom-tests int…
…o wd-aurora
ab6b4e1
@stupchiy stupchiy fixed Bebe comments c8dba6e
@AlinT AlinT Merge remote-tracking branch 'bebef1987/test_hover' into webdriver 8b5f3a7
Florin Strugariu Merge pull request #44 from stupchiy/wd-beta
[webdriver] migrated test_beta.py and beta.py
0969144
Florin Strugariu Merge pull request #43 from stupchiy/wd-aurora
[webdriver] migrated test_aurora.py and aurora.py
f117432
@teodosia teodosia Removed unused imports. 98b5a29
Bebe Merge remote-tracking branch 'mozilla/webdriver' into test_channel 61fbddb
Bebe updated 458a206
Florin Strugariu Merge pull request #41 from teodosia/wd-customize
[Webdriver]Migrated test_customize.py and customize.py
ed4f8f3
@AlinT AlinT Merge remote-tracking branch 'bebef1987/test_channel' into webdriver 15e2712
@retornam retornam clean running tests for webdriver branch 5da9b36
@retornam retornam Adding bedrock, skipsprod markers and tests for partner page f2f15e8
@retornam retornam fixing nits f78f952
@retornam retornam fixing urls for partners page and nits in contribute test 2321604
@m8ttyB m8ttyB Merge pull request #49 from retornam/bedrock
Cleaning up tests for webdriver branch
4dacac2
@retornam retornam removing skipsprod as this is now on production a731458
@retornam retornam fixing test_partners 092875f
@retornam retornam Merge branch 'master' into webdriver f2b857c
@retornam retornam adding wait to partners.py 40b0c94
@davehunt
Member

Who reviewed this change?

Member

@stephendonner said I could push directly to the webdriver branch and I did

Collaborator

That was after this commit; though, as this is a branch, I think requiring a final review before we merge this into master is prudent. But, also, let's try to do pulls from now on, and if you're not getting the traction you need, let me know.

Member

My mistake, I thought this was master... I hadn't realised the WebDriver migration was ongoing.

Member

Actually.. this isn't a branch, it's master afaict..?

Collaborator

@davehunt you're right -- forgot I had @m8ttyB sit down with Raymond last Friday and review; so we should definitely be doing pulls for each and every change, going forward. My bad.

@davehunt
Member

Again, where was this reviewed? Why are you waiting for a title after clicking the button? If you need an explicit wait then you need to add one that is appropriate to the action. In this instance you will have a page title before you click, and after you click, so waiting for a page title is not appropriate. It also doesn't make sense to me that an action method would be a property and return an unrelated value. Why does clicking a button return the current URL? This isn't appropriate use of page objects.

Member

I'm going to explain what I am trying to do here so you have a better understanding. I'm trying to click a button on the page which redirects me to another page. I want to check to see that after clicking the button, I am sent to the correct url. This is a shorter method which gets the job done and doesn't involve writing a lot of code.

Member

It may reduce the amount of code, but it's not appropriate use of page objects. If you are querying the page for a value then use a property, if you are performing actions on the page then only return objects related to the action (such as an page object for the resulting page). Something like assert page.click_button() == 'http://example.com' is not very readable. This would be better as page.click_button() followed by assert page.current_url == 'http://example.com'

In this particular instance, it may even be more appropriate to assert the href of the button rather than click it and rely on an external resource.

retornam and others added some commits May 8, 2012
@retornam retornam fix to test_partners 4fd8d60
@stephendonner stephendonner Merge pull request #50 from retornam/bedrock
fix to test_partners
4e6e6d4
@retornam retornam making change for bug 751903 5bac9a2
@retornam retornam making change for bug 751903 ed43f5b
@m8ttyB m8ttyB Merge pull request #51 from retornam/bedrock
making change for bug 751903
d8fe43e
@retornam retornam Updating the the coming soon locator due to bug 757519
The coming soon locator on the partners page was changed from #soon to #sign recently. I am updating the locator to point to new version
2d62922
@m8ttyB m8ttyB Merge pull request #52 from retornam/2d629228844c6e51ee0d38b6e23d777c…
…0064c437

Updating a locator
a697c9a
@retornam retornam Adding test for b2g page:
	First commit of tests for the b2g page under mozilla.org
1ffe108
@retornam retornam Adding test for b2g page:
	First commit of tests for the b2g page under mozilla.org
561de05
@retornam retornam fixing nits to b2g file 33d04a2
@retornam retornam fixing nits 58b138a
@retornam retornam fixing nits 028670d
@retornam retornam fixing final nit d53fc96
@stephendonner stephendonner Merge pull request #54 from retornam/bedrock
fixing nits
02aeaec
@retornam retornam Adding tests for about page:
	Adding about.py and test_about.py to test for about page on mozilla.org
fa81aa7
@retornam retornam Fixing broken elements for test_about 00e481e
@retornam retornam import fix 99631a1
@stephendonner stephendonner Merge pull request #55 from retornam/bedrock
Adding tests for about page:
f7420a8
@retornam retornam Bug 762674 Add Webmaker to Tabzilla
This bug adds a test for the webmaker link under the innovation section of the Tabzilla bar. This is fixed on dev and should only be merged once 762674 is on production. Thanks
2ae4f1d
@klrmn klrmn Merge pull request #56 from retornam/bedrock
Bug 762674 Add Webmaker to Tabzilla
8e0eb37
@rik rik Adapt to small markup changes 084373f
@klrmn klrmn interim commit for debugging c134188
@klrmn klrmn test existence of each link seperately
not as good as having named tests, but better than not knowing which
out of 6-8 links failed.
a1fc5b5
@klrmn klrmn Merge remote branch 'rik/fix-trunk' into fix_about_tests 4f9516b
@klrmn klrmn Revert "Merge remote branch 'rik/fix-trunk' into fix_about_tests"
This reverts commit 4f9516b, reversing
changes made to a1fc5b5.
08ac5b7
@klrmn klrmn Revert "Revert "Merge remote branch 'rik/fix-trunk' into fix_about_te…
…sts""

This reverts commit 08ac5b7.
802f427
@klrmn klrmn use loops rather than parameterize to save run time f67eecc
@klrmn klrmn really, i don't want to change those locators 07303dd
@retornam retornam Updating mobile redirect links. From bug 988ac2c
@stephendonner stephendonner Merge pull request #60 from retornam/bedrock
Updating mobile redirect links. From bug 768477
2278cd4
@retornam retornam Updating redirects for /mobile from bug https://bugzilla.mozilla.org/… 7451c6d
@stephendonner stephendonner Merge pull request #61 from retornam/bedrock
Updating redirects for /mobile
f0bce43
@rik rik Redirects for landing pages and other key pages for the nativeui launch f21fc77
@rik rik Adapt to small markup changes 165ff4a
@retornam retornam Merge pull request #62 from Rik/mobile-launch
Redirects for landing pages and other key pages for the nativeui launch
d9594fa
@retornam retornam Merge pull request #57 from Rik/fix-trunk
Adapt to small markup changes
096098a
@klrmn klrmn Merge remote branch 'upstream/master' into fix_about_tests b4d6f28
@klrmn klrmn send location as tuple 44e6ad5
@retornam retornam Merge pull request #59 from klrmn/fix_about_tests
run link tests in loop to isolate failures without adding run-time
e9648b3
@klrmn klrmn pep8 fix aa6b361
@klrmn klrmn somebody changed the footer! locators are simpler now b86036e
@klrmn klrmn make the footer link tests more relevant
* they should have the right text
* they should link to the right place
* they should return 200 if you get them
9f0367a
@klrmn klrmn make the footer logo test work for the 3 outlying classes 9fd477d
@klrmn klrmn remove footer subclass and xfail related tests 203df4a
@stephendonner stephendonner Merge pull request #63 from klrmn/fix_footer_links
make the footer link tests more relevant
8203745
@klrmn klrmn wherein leah corrects stupid mistake 73f9eb7
@stephendonner stephendonner Merge pull request #64 from klrmn/fix_footer_links
move the xfail to the right spot
fbe3954
@bobsilverberg bobsilverberg Updated requirements.txt to enable use of pytest-mozwebqa 1.0 25b4569
@stephendonner stephendonner Merge pull request #67 from bobsilverberg/requirementsUpdate
Updated requirements.txt to enable use of pytest-mozwebqa 1.0
5c6336f
@retornam retornam Adding tests for prodcuts page ea6a973
@retornam retornam Adding product page tests dd86ed1
Bebe fix locator af63145
@teodosia teodosia Merge pull request #69 from bebef1987/master
Fix footer locator
06d7df5
@rik rik Bug 780078 - Landing page for locales on mobile is now /{locale}/mobile d4fd657
@stephendonner stephendonner Merge pull request #70 from Rik/locales-redirect-780078
Bug 780078 - Landing page for locales on mobile is now /{locale}/mobile
9562f7a
retornam and others added some commits Sep 18, 2012
@retornam retornam Merge pull request #100 from bobsilverberg/url_change
Changed expected url from /ecosystem to /developers due to bug fix
5183ef0
@bobsilverberg bobsilverberg Removed unnecessary footer_link_destination and replaced with link_de…
…stination

Removed unused footer_link_functions
56bdd0b
@bobsilverberg bobsilverberg Added @pytest.mark.nondestructive to a test that was missing it faeacae
@stephendonner stephendonner Merge pull request #102 from bobsilverberg/fix_mark
Added @pytest.mark.nondestructive to a test that was missing it
ca0f2fc
@stephendonner stephendonner Merge pull request #94 from bobsilverberg/about_page
Updated about page test to check for expected destination and valid urls
46aba4d
@bobsilverberg bobsilverberg Updated mission page tests to check for expected destination for link…
…s and valid urls

Checking for valid urls for video sources too
af64a5d
@retornam retornam Merge pull request #103 from bobsilverberg/mission
Updated mission page tests to check for expected destination for links and valid urls
608775f
@retornam retornam Merge pull request #101 from bobsilverberg/link_destination_cleanup
Removed unnecessary footer_link_destination and replaced with link_destination
5804c7f
@bobsilverberg bobsilverberg Updated Products page object and tests to verify link destinations an…
…d url validity
3f0411d
@bobsilverberg bobsilverberg Updated contribute page to remove unused locators and methods
Added test for the Want To Help form on the contribute page
a80e1a6
@stephendonner stephendonner Merge pull request #107 from bobsilverberg/contribute
Updated contribute page to remove unused locators and methods
d9e9502
@bobsilverberg bobsilverberg Updated the b2g page to check link destinations, image names and url …
…validity
4df3c57
@bobsilverberg bobsilverberg Updated Partners page to check link destinations and url validity
Corrected names of locator variables
29385c0
@bobsilverberg bobsilverberg Updated Performance page to check for link destinations and url validity
Added tests for video src validity
Refactored video_sources_list into base.py
3e11d9c
@bobsilverberg bobsilverberg Fixed failing about page test 097bd9b
@stephendonner stephendonner Merge pull request #108 from bobsilverberg/b2g
Updated the b2g page to check link destinations, image names and url validity
68e5aff
@bobsilverberg bobsilverberg Merge branch 'master' into performance
Conflicts:
	pages/desktop/base.py
eec92c4
@stephendonner stephendonner Merge pull request #105 from bobsilverberg/products
Updated Products page object and tests to verify link destinations and url validity
714273d
zacc Merge pull request #109 from bobsilverberg/partners
Updated Partners page to check link destinations and url validity
ee654bd
@bobsilverberg bobsilverberg Moved video_sources_list methods back into individual page objects c7985dc
zacc Merge pull request #110 from bobsilverberg/performance
Updated Performance page to check for link destinations and url validity
ebac3cd
@bobsilverberg bobsilverberg Removed xfails for fixed bugs: 5c66b7b
@bebef1987 bebef1987 Merge pull request #111 from bobsilverberg/xpass
Removed xfails for fixed bugs
d8cc034
@bobsilverberg bobsilverberg Updated security.py and tests to verify expected link destinations an…
…d do url checking

Removed unused locators and methods
cf45e54
@retornam retornam Merge pull request #112 from bobsilverberg/security
Updated security.py and tests to verify expected link destinations and do url checking
1529d6e
@bobsilverberg bobsilverberg Added a test to check the visibility of the tabzilla links 20dd2b6
@bobsilverberg bobsilverberg Updated technology.py and tests to validate expected hrefs for links
Added url validity checking
Removed unused locators and methods
4a70b1a
@bobsilverberg bobsilverberg Updated sms.py and tests to check for expected hrefs for links
Added url validity checking
29d6ac1
@bobsilverberg bobsilverberg A proof-of-concept for soft failing link testing.
Fixed a bug in is_element_visible in page.py
b12012c
@bobsilverberg bobsilverberg Updated all the tests in test_technology.py to use soft fails 274c102
@retornam retornam fixing gitignore d986c4d
@retornam retornam fixing gitignore 3eece24
@retornam retornam updating files to ignore 356f8d6
@stephendonner stephendonner s/b2g/firefoxos, to match just-pushed changes to prod 2ff7ed3
@stephendonner stephendonner s/b2g/firefoxos, to match just-pushed changes to prod 0f3d4fb
@retornam retornam fixing gitignore 0067edf
@stephendonner stephendonner s/badge-b2g.jpg/badge-firefoxos.jpg, to match prod 94a35e3
@retornam retornam fixing broken firefoxos tests 93d5b9e
@retornam retornam Merge branch 'b2gfix' into mozmaster 503cfad
@bobsilverberg bobsilverberg Fixed problems with b2g page and tests to eliminate need for xfails 5dff4c5
@stephendonner stephendonner xfailing until we can take a closer look beaa671
@bobsilverberg bobsilverberg Reworked the code to that all invisible links are caught and reported
Also fixed a new bug with link now pointing to firefoxos rather than b2g
7d44254
@bobsilverberg bobsilverberg Removed now obsolete page object method 8fa3653
@retornam retornam Merge pull request #114 from bobsilverberg/visible
Added a test to check the visibility of the tabzilla links
55032ad
@bobsilverberg bobsilverberg Fixed bad link to b2g 23b12eb
@bobsilverberg bobsilverberg Added soft-fails to tests 009890b
@bobsilverberg bobsilverberg Added soft fails to the b2g tests 9103ba6
zacc Merge pull request #115 from bobsilverberg/tech
Updated technology.py and tests to validate expected hrefs for links
12cc467
@retornam retornam Merge pull request #116 from bobsilverberg/sms
Updated sms.py and tests to check for expected hrefs for links
56b5ba9
@stephendonner stephendonner Merge pull request #121 from bobsilverberg/b2g
Fixed problems with b2g page and tests to eliminate need for xfails
b720c9b
@bobsilverberg bobsilverberg Updated test_about to check for link visibility and to use soft fails dec1618
@bobsilverberg bobsilverberg Updated test_contribute to use soft fails 3678669
@bobsilverberg bobsilverberg Updated test_mission to check for link visibility and to use soft fails e1fed87
@bobsilverberg bobsilverberg Updated test_notes.py to use soft fails 8b5853e
@bobsilverberg bobsilverberg Updated test_partners.py to check for link visibility and to use soft…
… fails
a8ebdae
@stephendonner stephendonner Merge pull request #126 from bobsilverberg/notes
Updated test_notes.py to use soft fails
8cb9687
@AlinT AlinT Merge pull request #124 from bobsilverberg/contribute
Updated test_contribute to use soft fails
5feb63d
@teodosia teodosia Merge pull request #127 from bobsilverberg/partners
Updated test_partners.py to check for link visibility and to use soft fails
f09e673
@teodosia teodosia Merge pull request #125 from bobsilverberg/mission
Updated test_mission to check for link visibility and to use soft fails
af6417d
@teodosia teodosia Merge pull request #123 from bobsilverberg/about
Updated test_about to check for link visibility and to use soft fails
46c6cf1
@retornam retornam Adding tests for /firefox/all page 6a50e60
@bobsilverberg bobsilverberg Updated the link to Webmaker in tabzilla a8abc5f
@retornam retornam Merge pull request #129 from bobsilverberg/webmaker
Updated the link to Webmaker in tabzilla
368a27c
@bobsilverberg bobsilverberg Updated test_performance.py to add url checking and soft fails daaadc8
@bobsilverberg bobsilverberg Updated test_products.py to add visibility and url checking and soft …
…fails
0da2e3a
@bobsilverberg bobsilverberg Updated test_security.py to add visibility and url checking and soft …
…fails
b34150d
@retornam retornam Merge pull request #132 from bobsilverberg/security
Updated test_security.py to add visibility and url checking and soft fails
a8c9b57
@retornam retornam Merge pull request #130 from bobsilverberg/perf
Updated test_performance.py to add url checking and soft fails
114fdf5
@retornam retornam Merge pull request #131 from bobsilverberg/products
Updated test_products.py to add visibility and url checking and soft fails
8f9fd5b
retornam xfailing products page 4a4b1b5
retornam Merge branch 'master' of github.com:mozilla/mcom-tests into upmaster 771fe64
@retornam retornam fixing webmaker link until push to prod 4347f86
@rik rik We are now at Firefox 16 !
bug 804604
cf4b794
@retornam retornam Merge pull request #135 from Rik/current-firefox-804604
We are now at Firefox 16 !
c296d93
@stephendonner stephendonner Merge pull request #134 from retornam/fixproducts
fixing webmaker link until push to prod
8555799
@bobsilverberg bobsilverberg Removed tests for partners page (which no longer exists)
Added tests for /apps/ page
This closes issue #104
bc531f9
@retornam retornam Merge pull request #137 from bobsilverberg/apps
Removed tests for partners page (which no longer exists)
30a3b0a
@retornam retornam Adding tests for mozilla based projects page
Adding tests for mozilla based projects page

Adding tests for mozilla based projects page

Adding tests for mozilla based projects page

Adding tests for mozilla based projects page
9ddc9c0
@stephendonner stephendonner Merge pull request #128 from retornam/mozillabased
Adding tests for mozilla based projects page
5da75ed
@retornam retornam xfailing test_apps due to bug 805113 5703491
@stephendonner stephendonner Merge pull request #138 from retornam/bug805113
xfailing test_apps due to bug 805113
8006332
@retornam retornam bug 730488 adding redirect test for all-older.html page 026fb80
@AlinT AlinT Merge pull request #139 from retornam/bug730488
bug 730488 adding redirect test for all-older.html page
daf88fe
@bobsilverberg bobsilverberg Merge pull request #140 from retornam/locales
Adding tests for /firefox/all page
83a2ec4
Ratnadeep Debnath Fix a typo in README.md dc6945f
@retornam retornam Merge pull request #142 from rtnpro/fix_readme_typo
Fix a typo in README.md
9f10da1
rtnpro Fix baseurl for running selenium tests. ffc36be
@AlinT AlinT Merge pull request #144 from rtnpro/fix_baseurl
Fix baseurl for running selenium tests.
fb349c0
@retornam retornam fixing footer likn for the privacy policy 9d71b4c
@stephendonner stephendonner Merge pull request #145 from retornam/privacylinkfix
fixing footer link for the privacy policy
1cf2637
@bobsilverberg bobsilverberg Added a sample credentials file with a fake phone number for the send…
…_sms test
565362e
@stephendonner stephendonner Merge pull request #147 from bobsilverberg/cred
Added a sample credentials file with a fake phone number for the send_sms test
c1505a5
@teodosia teodosia Xfailed TestAps.test_showcased_apps_link_urls_are_valid
https://bugzilla.mozilla.org/show_bug.cgi?id=813048 - Page not found returned if clicking the "Pomodoro" app
486dfdd
@bebef1987 bebef1987 Merge pull request #148 from teodosia/xfail-app-url
Xfailed TestAps.test_showcased_apps_link_urls_are_valid
158361a
@retornam retornam Bug 805113 and 813048 have been fixed so I removed the xfails for the…
…m. I aslo added the new marketplace url to pages/desktop/apps.py
5186af2
@stephendonner stephendonner Merge pull request #149 from retornam/appsurlfix
Bug 805113 and 813048 have been fixed so I removed the xfails for them. ...
14c136d
@teodosia
Contributor

Lgtm. @retornam is the best person to do the honors :).

@AlinT
Contributor
AlinT commented Nov 26, 2012

Lgtm also!

@retornam retornam merged commit 05a18ce into prod Nov 26, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment