[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Update wgMinervaBottomLanguageButton default value

2016-10-13 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Update wgMinervaBottomLanguageButton default value
..


Update wgMinervaBottomLanguageButton default value

$wgMinervaBottomLanguageButton was set to `false` in I1ac60838 and
Ie9dafeb3, which caused the nightly build to fail [0] while local builds
still passed.

Changes:
* Set the default value of $wgMinervaBottomLanguageButton to `false`.
* Remove browser tests that make assertions about the presence of the
  language switcher secondary page action.

[0]: https://integration.wikimedia.org/ci/job/selenium-MobileFrontend/191/

Bug: T143829
Change-Id: Ie576870b5fae213eacef1f80c3d1d087141cadab
---
M extension.json
M tests/browser/features/editor_wikitext_saving.feature
M tests/browser/features/step_definitions/editor_steps.rb
M tests/browser/features/step_definitions/language_steps.rb
M tests/browser/features/support/pages/article_page.rb
5 files changed, 1 insertion(+), 16 deletions(-)

Approvals:
  Jhobs: Looks good to me, but someone else must approve
  Jdlrobson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index 1eb0a0a..724ba7c 100644
--- a/extension.json
+++ b/extension.json
@@ -2048,7 +2048,7 @@
"MFSchemaEditSampleRate": 0.0625,
"MFAllowNonJavaScriptEditing": false,
"MinervaAlwaysShowLanguageButton": true,
-   "MinervaBottomLanguageButton": true,
+   "MinervaBottomLanguageButton": false,
"MinervaUseFooterV2": true,
"MFStripResponsiveImages": true,
"MFResponsiveImageWhitelist": [
diff --git a/tests/browser/features/editor_wikitext_saving.feature 
b/tests/browser/features/editor_wikitext_saving.feature
index 35e7627..d425651 100644
--- a/tests/browser/features/editor_wikitext_saving.feature
+++ b/tests/browser/features/editor_wikitext_saving.feature
@@ -14,7 +14,6 @@
   And I click submit
 Then I should see a toast notification
   And the text of the first heading should be "Selenium no languages test 
page"
-  And I should not see the read in another language button
 
   @editing
   Scenario: Successful edit reloads language button
@@ -25,7 +24,6 @@
   And I click continue
   And I click submit
 Then I should see a toast notification
-  And I should see the read in another language button
 
   @editing
   Scenario: Redirects
diff --git a/tests/browser/features/step_definitions/editor_steps.rb 
b/tests/browser/features/step_definitions/editor_steps.rb
index fff8809..4551c69 100644
--- a/tests/browser/features/step_definitions/editor_steps.rb
+++ b/tests/browser/features/step_definitions/editor_steps.rb
@@ -39,18 +39,10 @@
   on(ArticlePage).editor_textarea_element.when_present.send_keys(text)
 end
 
-Then(/^I should not see the read in another language button$/) do
-  expect(on(ArticlePage).language_button_element).not_to be_visible
-end
-
 Then(/^I should not see the wikitext editor overlay$/) do
   expect(on(ArticlePage).editor_overlay_element).not_to be_visible
 end
 
 Then(/^I see the anonymous editor warning$/) do
   expect(on(ArticlePage).anon_editor_warning_element.when_present).to 
be_visible
-end
-
-Then /^I should see the read in another language button$/ do
-  expect(on(ArticlePage).language_button_element.when_present).to be_visible
 end
diff --git a/tests/browser/features/step_definitions/language_steps.rb 
b/tests/browser/features/step_definitions/language_steps.rb
index ed279fc..2b8eb30 100644
--- a/tests/browser/features/step_definitions/language_steps.rb
+++ b/tests/browser/features/step_definitions/language_steps.rb
@@ -1,7 +1,3 @@
-When /^I click the language button$/ do
-  on(ArticlePage).language_button_element.when_present.click
-end
-
 When(/^I click the language overlay close button$/) do
   on(ArticlePage).overlay_languages_element.when_present.button_element(class: 
'cancel').click
 end
diff --git a/tests/browser/features/support/pages/article_page.rb 
b/tests/browser/features/support/pages/article_page.rb
index 1af42d3..42fdcbc 100644
--- a/tests/browser/features/support/pages/article_page.rb
+++ b/tests/browser/features/support/pages/article_page.rb
@@ -143,7 +143,6 @@
 
   # secondary menu
   ## languages
-  a(:language_button, css: '#page-secondary-actions .language-selector')
   a(:switch_language_page_action, css: '#page-actions .language-selector')
   a(:disabled_switch_langage_page_action, css: '#page-actions 
.language-selector.disabled')
   # Can't use generic overlay class as this will match with the LoadingOverlay 
that shows before loading the language overlay

-- 
To view, visit https://gerrit.wikimedia.org/r/315668
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie576870b5fae213eacef1f80c3d1d087141cadab
Gerrit-PatchSet: 1
Gerrit-Project: 

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Update wgMinervaBottomLanguageButton default value

2016-10-13 Thread Phuedx (Code Review)
Phuedx has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315668

Change subject: Update wgMinervaBottomLanguageButton default value
..

Update wgMinervaBottomLanguageButton default value

$wgMinervaBottomLanguageButton was set to `false` in I1ac60838 and
Ie9dafeb3, which caused the nightly build to fail [0] while local builds
still passed.

Changes:
* Set the default value of $wgMinervaBottomLanguageButton to `false`.
* Remove browser tests that make assertions about the presence of the
  language switcher secondary page action.

[0]: https://integration.wikimedia.org/ci/job/selenium-MobileFrontend/191/

Bug: T143829
Change-Id: Ie576870b5fae213eacef1f80c3d1d087141cadab
---
M extension.json
M tests/browser/features/editor_wikitext_saving.feature
M tests/browser/features/step_definitions/editor_steps.rb
M tests/browser/features/step_definitions/language_steps.rb
M tests/browser/features/support/pages/article_page.rb
5 files changed, 1 insertion(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/68/315668/1

diff --git a/extension.json b/extension.json
index 1eb0a0a..724ba7c 100644
--- a/extension.json
+++ b/extension.json
@@ -2048,7 +2048,7 @@
"MFSchemaEditSampleRate": 0.0625,
"MFAllowNonJavaScriptEditing": false,
"MinervaAlwaysShowLanguageButton": true,
-   "MinervaBottomLanguageButton": true,
+   "MinervaBottomLanguageButton": false,
"MinervaUseFooterV2": true,
"MFStripResponsiveImages": true,
"MFResponsiveImageWhitelist": [
diff --git a/tests/browser/features/editor_wikitext_saving.feature 
b/tests/browser/features/editor_wikitext_saving.feature
index 35e7627..d425651 100644
--- a/tests/browser/features/editor_wikitext_saving.feature
+++ b/tests/browser/features/editor_wikitext_saving.feature
@@ -14,7 +14,6 @@
   And I click submit
 Then I should see a toast notification
   And the text of the first heading should be "Selenium no languages test 
page"
-  And I should not see the read in another language button
 
   @editing
   Scenario: Successful edit reloads language button
@@ -25,7 +24,6 @@
   And I click continue
   And I click submit
 Then I should see a toast notification
-  And I should see the read in another language button
 
   @editing
   Scenario: Redirects
diff --git a/tests/browser/features/step_definitions/editor_steps.rb 
b/tests/browser/features/step_definitions/editor_steps.rb
index fff8809..4551c69 100644
--- a/tests/browser/features/step_definitions/editor_steps.rb
+++ b/tests/browser/features/step_definitions/editor_steps.rb
@@ -39,18 +39,10 @@
   on(ArticlePage).editor_textarea_element.when_present.send_keys(text)
 end
 
-Then(/^I should not see the read in another language button$/) do
-  expect(on(ArticlePage).language_button_element).not_to be_visible
-end
-
 Then(/^I should not see the wikitext editor overlay$/) do
   expect(on(ArticlePage).editor_overlay_element).not_to be_visible
 end
 
 Then(/^I see the anonymous editor warning$/) do
   expect(on(ArticlePage).anon_editor_warning_element.when_present).to 
be_visible
-end
-
-Then /^I should see the read in another language button$/ do
-  expect(on(ArticlePage).language_button_element.when_present).to be_visible
 end
diff --git a/tests/browser/features/step_definitions/language_steps.rb 
b/tests/browser/features/step_definitions/language_steps.rb
index ed279fc..2b8eb30 100644
--- a/tests/browser/features/step_definitions/language_steps.rb
+++ b/tests/browser/features/step_definitions/language_steps.rb
@@ -1,7 +1,3 @@
-When /^I click the language button$/ do
-  on(ArticlePage).language_button_element.when_present.click
-end
-
 When(/^I click the language overlay close button$/) do
   on(ArticlePage).overlay_languages_element.when_present.button_element(class: 
'cancel').click
 end
diff --git a/tests/browser/features/support/pages/article_page.rb 
b/tests/browser/features/support/pages/article_page.rb
index 1af42d3..42fdcbc 100644
--- a/tests/browser/features/support/pages/article_page.rb
+++ b/tests/browser/features/support/pages/article_page.rb
@@ -143,7 +143,6 @@
 
   # secondary menu
   ## languages
-  a(:language_button, css: '#page-secondary-actions .language-selector')
   a(:switch_language_page_action, css: '#page-actions .language-selector')
   a(:disabled_switch_langage_page_action, css: '#page-actions 
.language-selector.disabled')
   # Can't use generic overlay class as this will match with the LoadingOverlay 
that shows before loading the language overlay

-- 
To view, visit https://gerrit.wikimedia.org/r/315668
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie576870b5fae213eacef1f80c3d1d087141cadab
Gerrit-PatchSet: 1
Gerrit-Project: