[MediaWiki-commits] [Gerrit] Check that elements that do not need it do not use Autonym font - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged.
Change subject: Check that elements that do not need it do not use Autonym font
..
Check that elements that do not need it do not use Autonym font
Change-Id: I2a865d61403b5556a8f6d69aa1fe3e10727e87ae
---
M tests/browser/features/autonym.feature
M tests/browser/features/step_definitions/autonym_steps.rb
M tests/browser/features/step_definitions/panel_steps.rb
M tests/browser/features/support/pages/interlanguage_page.rb
A tests/browser/features/support/pages/main_page.rb
5 files changed, 33 insertions(+), 12 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/browser/features/autonym.feature
b/tests/browser/features/autonym.feature
index fd4d9ca..34b39b6 100644
--- a/tests/browser/features/autonym.feature
+++ b/tests/browser/features/autonym.feature
@@ -21,11 +21,11 @@
When I click the button with the ellipsis
Then the language list of ULS should use Autonym font
- @login @en.wikipedia.beta.wmflabs.org
- Scenario: Autonym font should be used in the Interlanguage area of a page
with Interlanguage links
-Given I am logged in
-When I am on a page with interlanguage links
-Then the Interlanguage area should use Autonym font
+ @en.wikipedia.beta.wmflabs.org
+ Scenario: Autonym font should be used in the Interlanguage area of a page
only with Interlanguage links
+When I am on the main page
+Then the Interlanguage links should use Autonym font
+ And elements that are not Interlanguage links should not use Autonym font
@anon-language-selection @commons.wikimedia.beta.wmflabs.org
Scenario: Autonym font is used in the ULS language search dialog for input
language selection by anonymous users
diff --git a/tests/browser/features/step_definitions/autonym_steps.rb
b/tests/browser/features/step_definitions/autonym_steps.rb
index 4a8bebc..9724f54 100644
--- a/tests/browser/features/step_definitions/autonym_steps.rb
+++ b/tests/browser/features/step_definitions/autonym_steps.rb
@@ -1,7 +1,19 @@
+When(/^I am on the main page$/) do
+ visit MainPage
+end
+
Then(/^I open Input panel of language settings$/) do
- on(PanelPage).panel_input_element.when_visible.click
+ on(PanelPage).panel_input_element.when_visible.click
end
Then(/^I open Input side panel of language settings$/) do
- on(PanelPage).panel_side_input_element.when_visible.click
+ on(PanelPage).panel_side_input_element.when_visible.click
+end
+
+Then(/^the Interlanguage links should use Autonym font$/) do
+
on(InterlanguagePage).interlang_link_element.style(font-family).should ==
'Autonym',sans-serif
+end
+
+Then(/^elements that are not Interlanguage links should not use Autonym
font$/) do
+ on(MainPage).non_interlanguage_links_use_autonym_font?.should == false
end
diff --git a/tests/browser/features/step_definitions/panel_steps.rb
b/tests/browser/features/step_definitions/panel_steps.rb
index 395cc3e..927d2ef 100644
--- a/tests/browser/features/step_definitions/panel_steps.rb
+++ b/tests/browser/features/step_definitions/panel_steps.rb
@@ -76,10 +76,6 @@
on(PanelPage).autonym_element.style(font-family).should ==
'Autonym',sans-serif
end
-Then(/^the Interlanguage area should use Autonym font$/) do
-
on(InterlanguagePage).interlang_link_element.style(font-family).should ==
'Autonym',sans-serif
-end
-
Then(/^I should see (.*) as the selected input language$/) do |language|
on(PanelPage).default_language_button_element.text.should == language
end
diff --git a/tests/browser/features/support/pages/interlanguage_page.rb
b/tests/browser/features/support/pages/interlanguage_page.rb
index 9da2645..7e3e451 100644
--- a/tests/browser/features/support/pages/interlanguage_page.rb
+++ b/tests/browser/features/support/pages/interlanguage_page.rb
@@ -1,5 +1,6 @@
class InterlanguagePage
include PageObject
+ include InterlanguagePageModule
include URL
def self.url
@@ -7,5 +8,5 @@
end
page_url url
- include InterlanguagePageModule
end
+
diff --git a/tests/browser/features/support/pages/main_page.rb
b/tests/browser/features/support/pages/main_page.rb
new file mode 100644
index 000..fce8e55
--- /dev/null
+++ b/tests/browser/features/support/pages/main_page.rb
@@ -0,0 +1,12 @@
+class MainPage
+ include PageObject
+
+ include URL
+ page_url URL.url('Main_Page')
+
+ def non_interlanguage_links_use_autonym_font?
+ @browser.elements(css: '#p-lang
li:not(.interlanguage-link)').collect do |element|
+ element.style(font-family)
+ end.to_s.match(/Autonym/) != nil
+ end
+end
--
To view, visit https://gerrit.wikimedia.org/r/97718
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a865d61403b5556a8f6d69aa1fe3e10727e87ae
[MediaWiki-commits] [Gerrit] Check that elements that do not need it do not use Autonym font - change (mediawiki...UniversalLanguageSelector)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/97718
Change subject: Check that elements that do not need it do not use Autonym font
..
Check that elements that do not need it do not use Autonym font
Change-Id: I2a865d61403b5556a8f6d69aa1fe3e10727e87ae
---
M tests/browser/features/autonym.feature
M tests/browser/features/step_definitions/autonym_steps.rb
M tests/browser/features/step_definitions/panel_steps.rb
M tests/browser/features/support/pages/interlanguage_page.rb
A tests/browser/features/support/pages/main_page.rb
5 files changed, 31 insertions(+), 10 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/18/97718/1
diff --git a/tests/browser/features/autonym.feature
b/tests/browser/features/autonym.feature
index fd4d9ca..34b39b6 100644
--- a/tests/browser/features/autonym.feature
+++ b/tests/browser/features/autonym.feature
@@ -21,11 +21,11 @@
When I click the button with the ellipsis
Then the language list of ULS should use Autonym font
- @login @en.wikipedia.beta.wmflabs.org
- Scenario: Autonym font should be used in the Interlanguage area of a page
with Interlanguage links
-Given I am logged in
-When I am on a page with interlanguage links
-Then the Interlanguage area should use Autonym font
+ @en.wikipedia.beta.wmflabs.org
+ Scenario: Autonym font should be used in the Interlanguage area of a page
only with Interlanguage links
+When I am on the main page
+Then the Interlanguage links should use Autonym font
+ And elements that are not Interlanguage links should not use Autonym font
@anon-language-selection @commons.wikimedia.beta.wmflabs.org
Scenario: Autonym font is used in the ULS language search dialog for input
language selection by anonymous users
diff --git a/tests/browser/features/step_definitions/autonym_steps.rb
b/tests/browser/features/step_definitions/autonym_steps.rb
index 4a8bebc..ac8156f 100644
--- a/tests/browser/features/step_definitions/autonym_steps.rb
+++ b/tests/browser/features/step_definitions/autonym_steps.rb
@@ -1,3 +1,7 @@
+When(/^I am on the main page$/) do
+ visit MainPage
+end
+
Then(/^I open Input panel of language settings$/) do
on(PanelPage).panel_input_element.when_visible.click
end
@@ -5,3 +9,11 @@
Then(/^I open Input side panel of language settings$/) do
on(PanelPage).panel_side_input_element.when_visible.click
end
+
+Then(/^the Interlanguage links should use Autonym font$/) do
+
on(InterlanguagePage).interlang_link_element.style(font-family).should ==
'Autonym',sans-serif
+end
+
+Then(/^elements that are not Interlanguage links should not use Autonym
font$/) do
+ on(MainPage).non_interlanguage_links_use_autonym_font?.should == false
+end
diff --git a/tests/browser/features/step_definitions/panel_steps.rb
b/tests/browser/features/step_definitions/panel_steps.rb
index 9e6336c..8d87e8f 100644
--- a/tests/browser/features/step_definitions/panel_steps.rb
+++ b/tests/browser/features/step_definitions/panel_steps.rb
@@ -74,10 +74,6 @@
on(PanelPage).autonym_element.style(font-family).should ==
'Autonym',sans-serif
end
-Then(/^the Interlanguage area should use Autonym font$/) do
-
on(InterlanguagePage).interlang_link_element.style(font-family).should ==
'Autonym',sans-serif
-end
-
Then(/^I should see (.*) as the selected input language$/) do |language|
on(PanelPage).default_language_button_element.text.should == language
end
diff --git a/tests/browser/features/support/pages/interlanguage_page.rb
b/tests/browser/features/support/pages/interlanguage_page.rb
index 9da2645..7e3e451 100644
--- a/tests/browser/features/support/pages/interlanguage_page.rb
+++ b/tests/browser/features/support/pages/interlanguage_page.rb
@@ -1,5 +1,6 @@
class InterlanguagePage
include PageObject
+ include InterlanguagePageModule
include URL
def self.url
@@ -7,5 +8,5 @@
end
page_url url
- include InterlanguagePageModule
end
+
diff --git a/tests/browser/features/support/pages/main_page.rb
b/tests/browser/features/support/pages/main_page.rb
new file mode 100644
index 000..fce8e55
--- /dev/null
+++ b/tests/browser/features/support/pages/main_page.rb
@@ -0,0 +1,12 @@
+class MainPage
+ include PageObject
+
+ include URL
+ page_url URL.url('Main_Page')
+
+ def non_interlanguage_links_use_autonym_font?
+ @browser.elements(css: '#p-lang
li:not(.interlanguage-link)').collect do |element|
+ element.style(font-family)
+ end.to_s.match(/Autonym/) != nil
+ end
+end
--
To view, visit https://gerrit.wikimedia.org/r/97718
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a865d61403b5556a8f6d69aa1fe3e10727e87ae
Gerrit-PatchSet: 1
Gerrit-Project:
