Mgrover has uploaded a new change for review.
https://gerrit.wikimedia.org/r/64500
Change subject: Figured out the css issue this can be merged
......................................................................
Figured out the css issue this can be merged
Change-Id: Icead7088dfa7a62e48ec2c4fe11d4ed57073e35d
---
M tests/acceptance/features/random_ua.feature
M tests/acceptance/features/step_definitions/random_ua_steps.rb
M tests/acceptance/features/support/env.rb
M tests/acceptance/features/support/pages/random_page.rb
4 files changed, 74 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/00/64500/1
diff --git a/tests/acceptance/features/random_ua.feature
b/tests/acceptance/features/random_ua.feature
index 4024b88..2792c1f 100644
--- a/tests/acceptance/features/random_ua.feature
+++ b/tests/acceptance/features/random_ua.feature
@@ -1,16 +1,27 @@
@firefox @user_agent
Feature: Setting User Agents
- Scenario Outline:
- Given that I have set my user agent <user_agent>
- When I visit a random page <user_agent>
- Then I see that the user agent has been set <results>
+ Scenario: Opera Mini
+ Given that I am using Opera/9.80 (J2ME/MIDP; Opera Mini/9.80 (S60; SymbOS;
Opera Mobi/23.348; U; en) Presto/2.5.25 Version/10.54
+ When I go to random page
+ Then I see that the correct user agent has been set
+ And I see the Go button
+ And I see Home element
+ And I see Random element
+ And I see Settings element
+ And I do not see Watchlist element
+ And I do not see Uploads element
+ And I do not see Login/Logout element
- Examples:
- | user_agent | results |
- |Opera/9.80 (J2ME/MIDP; Opera Mini/9.80 (S60; SymbOS; Opera Mobi/23.348;
U; en) Presto/2.5.25 Version/10.54|Opera/9.80 (J2ME/MIDP; Opera Mini/9.80 (S60;
SymbOS; Opera Mobi/23.348; U; en) Presto/2.5.25 Version/10.54|
- #|Mozilla/4.0 (compatible; Linux 2.6.10) NetFront/3.4 Kindle/1.0 (screen
600x800)|Mozilla/4.0 (compatible; Linux 2.6.10) NetFront/3.4 Kindle/1.0 (screen
600x800)|
- #|Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5; Trident/5.0;
IEMobile/9.0)|Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5;
Trident/5.0; IEMobile/9.0)|
- #|Mozilla/5.0 (BlackBerry; U; BlackBerry 9900; en) AppleWebKit/534.11+
(KHTML, like Gecko) Version/7.1.0.346 Mobile Safari/534.11+|Mozilla/5.0
(BlackBerry; U; BlackBerry 9900; en) AppleWebKit/534.11+ (KHTML, like Gecko)
Version/7.1.0.346 Mobile Safari/534.11+|
- |Mozilla/5.0 (Linux; U; Android 4.0.3; ko-kr; LG-L160L Build/IML74K)
AppleWebkit/534.30 (KHTML, like Gecko) Version/4.0 Mobile
Safari/534.30|Mozilla/5.0 (Linux; U; Android 4.0.3; ko-kr; LG-L160L
Build/IML74K) AppleWebkit/534.30 (KHTML, like Gecko) Version/4.0 Mobile
Safari/534.30|
- #|Mozilla/5.0 (Linux; U; Android 2.2; en-sa; HTC_DesireHD_A9191
Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile
Safari/533.1|Mozilla/5.0 (Linux; U; Android 2.2; en-sa; HTC_DesireHD_A9191
Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile
Safari/533.1|
+
+ Scenario: Android 4.0.3
+ Given that I am using Mozilla/5.0 (Linux; U; Android 4.0.3; ko-kr;
LG-L160L Build/IML74K) AppleWebkit/534.30 (KHTML, like Gecko) Version/4.0
Mobile Safari/534.30
+ When I go to random page
+ Then I see that the correct user agent has been set
+ And I see the Watchlist star
+ And I see Home element
+ And I see Random element
+ And I see Settings element
+ And I see Watchlist element
+ And I see Uploads element
+ And I see Login/Logout element
\ No newline at end of file
diff --git a/tests/acceptance/features/step_definitions/random_ua_steps.rb
b/tests/acceptance/features/step_definitions/random_ua_steps.rb
index 2333e81..b611e57 100644
--- a/tests/acceptance/features/step_definitions/random_ua_steps.rb
+++ b/tests/acceptance/features/step_definitions/random_ua_steps.rb
@@ -1,22 +1,54 @@
-Given /^that I have set my user agent (.+)$/ do |user_agent|
+Given /^that I am using (.+)$/ do |user_agent|
+ @user_agent = user_agent
@browser = browser(environment, test_name(@scenario), @saucelabs_username,
@saucelabs_key, user_agent)
@browser.window.resize_to(480,800)
end
-When /^I visit a random page (.+)$/ do |user_agent|
- visit(RandomPage) do |page|
- page.go_button_element.exists?
- page.home_button_element.should be_true
- page.random_button_element.should be_true
- page.settings_button_element.should be_true
- page.uploads_button_element.should_not be_visible
- on(HomePage).watch_link_element.should_not be_visible
- page.watchlist_button_element.should_not be_visible
- end
+Then(/^I see Home element$/) do
+ @browser.li(class: 'icon-home').style(:display).should == 'list-item'
end
-Then /^I see that the user agent has been set (.+)$/ do |results|
- @browser.execute_script('return navigator.userAgent').should == results
+Then(/^I see Random element$/) do
+ @browser.li(class: 'icon-random').style(:display).should == 'list-item'
end
+Then(/^I see Settings element$/) do
+ @browser.li(class: 'icon-settings').style(:display).should == 'list-item'
+end
+
+Then(/^I do not see Watchlist element$/) do
+ @browser.li(class: 'icon-watchlist jsonly').style(:display).should ==
'none'
+end
+
+Then(/^I do not see Uploads element$/) do
+ @browser.li(class: 'icon-uploads jsonly').style(:display).should == 'none'
+end
+
+Then(/^I do not see Login\/Logout element$/) do
+ @browser.li(class: 'icon-loginout jsonly').style(:display).should == 'none'
+end
+
+Then(/^I see Watchlist element$/) do
+ @browser.li(class: 'icon-watchlist jsonly').style(:display).should ==
'block'
+end
+
+Then(/^I see Uploads element$/) do
+ @browser.li(class: 'icon-uploads jsonly').style(:display).should == 'block'
+end
+
+Then(/^I see Login\/Logout element$/) do
+ @browser.li(class: 'icon-loginout jsonly').style(:display).should ==
'block'
+end
+
+Then /^I see that the correct user agent has been set$/ do
+ @browser.execute_script('return navigator.userAgent').should == @user_agent
+end
+
+Then(/^I see the Go button$/) do
+ on(RandomPage).go_button_element.should exist
+end
+
+Then(/^I see the Watchlist star$/) do
+ on(HomePage).watch_link_element.should exist
+end
diff --git a/tests/acceptance/features/support/env.rb
b/tests/acceptance/features/support/env.rb
index 4230907..bdf0cac 100644
--- a/tests/acceptance/features/support/env.rb
+++ b/tests/acceptance/features/support/env.rb
@@ -112,5 +112,5 @@
sauce_api(%Q{{"passed": #{scenario.passed?}}}, saucelabs_username,
saucelabs_key)
sauce_api(%Q{{"public": true}}, saucelabs_username, saucelabs_key)
end
- #@browser.close
+ @browser.close
end
diff --git a/tests/acceptance/features/support/pages/random_page.rb
b/tests/acceptance/features/support/pages/random_page.rb
index 2d8de23..36ffa5b 100644
--- a/tests/acceptance/features/support/pages/random_page.rb
+++ b/tests/acceptance/features/support/pages/random_page.rb
@@ -12,9 +12,9 @@
page_url url
button(:go_button, value:'Go')
- a(:home_button, class:'icon-home')
- a(:random_button, class:'icon-random')
- a(:settings_button, class:'icon-settings')
- a(:uploads_button, class:'icon-uploads')
- a(:watchlist_button, class:'icon-watchlist')
+ li(:home_button, class:'icon-home')
+ li(:random_button, class:'icon-random')
+ li(:settings_button, class:'icon-settings')
+ li(:uploads_button, class:'icon-uploads')
+ li(:watchlist_button, class:'icon-watchlist')
end
--
To view, visit https://gerrit.wikimedia.org/r/64500
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icead7088dfa7a62e48ec2c4fe11d4ed57073e35d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Mgrover <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
