Merge "Fix CSSMin url() remapping when comments in CSS contain curly braces"

diff --git a/includes/htmlform/HTMLCheckField.php b/includes/htmlform/HTMLCheckField.php
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/includes/installer/MssqlUpdater.php b/includes/installer/MssqlUpdater.php
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/maintenance/mssql/archives/named_constraints.sql b/maintenance/mssql/archives/named_constraints.sql
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/maintenance/mssql/tables.sql b/maintenance/mssql/tables.sql
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resources/lib/jquery.ui/themes/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png b/resources/lib/jquery.ui/themes/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resources/lib/jquery.ui/themes/smoothness/images/ui-bg_flat_75_ffffff_40x100.png b/resources/lib/jquery.ui/themes/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resources/lib/jquery.ui/themes/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png b/resources/lib/jquery.ui/themes/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resources/lib/jquery.ui/themes/smoothness/images/ui-bg_glass_65_ffffff_1x400.png b/resources/lib/jquery.ui/themes/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resources/lib/jquery.ui/themes/smoothness/images/ui-bg_glass_75_dadada_1x400.png b/resources/lib/jquery.ui/themes/smoothness/images/ui-bg_glass_75_dadada_1x400.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resources/lib/jquery.ui/themes/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png b/resources/lib/jquery.ui/themes/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resources/lib/jquery.ui/themes/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png b/resources/lib/jquery.ui/themes/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resources/lib/jquery.ui/themes/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/resources/lib/jquery.ui/themes/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resources/lib/jquery.ui/themes/smoothness/images/ui-icons_222222_256x240.png b/resources/lib/jquery.ui/themes/smoothness/images/ui-icons_222222_256x240.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resources/lib/jquery.ui/themes/smoothness/images/ui-icons_2e83ff_256x240.png b/resources/lib/jquery.ui/themes/smoothness/images/ui-icons_2e83ff_256x240.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resources/lib/jquery.ui/themes/smoothness/images/ui-icons_454545_256x240.png b/resources/lib/jquery.ui/themes/smoothness/images/ui-icons_454545_256x240.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resources/lib/jquery.ui/themes/smoothness/images/ui-icons_888888_256x240.png b/resources/lib/jquery.ui/themes/smoothness/images/ui-icons_888888_256x240.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resources/lib/jquery.ui/themes/smoothness/images/ui-icons_cd0a0a_256x240.png b/resources/lib/jquery.ui/themes/smoothness/images/ui-icons_cd0a0a_256x240.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resources/src/mediawiki.less/mediawiki.mixins.less b/resources/src/mediawiki.less/mediawiki.mixins.less
index 67e2f33..b65a62b 100644 (file)
--- a/resources/src/mediawiki.less/mediawiki.mixins.less
+++ b/resources/src/mediawiki.less/mediawiki.mixins.less
@@ -61,7 +61,6 @@
 }
 
 .transition(@value) {
-       -webkit-backface-visibility: hidden; // fixes Chrome 1px movement bug
        -webkit-transition: @value;
        -moz-transition: @value;
        -o-transition: @value;

diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile
index fd6803e..3c28d7a 100755 (executable)
--- a/tests/browser/Gemfile
+++ b/tests/browser/Gemfile
@@ -1,4 +1,5 @@
-#ruby=ruby-2.1.1
+#ruby=ruby-2.1.2
+#ruby-gemset=core
 
 source "https://rubygems.org"
 

diff --git a/tests/browser/features/create_account.feature b/tests/browser/features/create_account.feature
index a8a96d6..d6745ad 100644 (file)
--- a/tests/browser/features/create_account.feature
+++ b/tests/browser/features/create_account.feature
@@ -1,3 +1,4 @@
+@chrome @clean @en.wikipedia.beta.wmflabs.org @firefox @phantomjs @test2.wikipedia.org
 Feature: Create account
 
   Scenario Outline: Go to Create account page

diff --git a/tests/browser/features/create_and_follow_wiki_link.feature b/tests/browser/features/create_and_follow_wiki_link.feature
index f5f0ce0..90e062d 100644 (file)
--- a/tests/browser/features/create_and_follow_wiki_link.feature
+++ b/tests/browser/features/create_and_follow_wiki_link.feature
@@ -1,4 +1,4 @@
-
+@chrome @clean @en.wikipedia.beta.wmflabs.org @firefox @phantomjs @test2.wikipedia.org
 Feature: Create Page With Wiki Link
 
   Scenario: Create Page With Wiki Link

diff --git a/tests/browser/features/edit_page.feature b/tests/browser/features/edit_page.feature
index 53efd6b..ef9991a 100644 (file)
--- a/tests/browser/features/edit_page.feature
+++ b/tests/browser/features/edit_page.feature
@@ -1,3 +1,4 @@
+@chrome @clean @en.wikipedia.beta.wmflabs.org @firefox @phantomjs @test2.wikipedia.org
 Feature: Edit Page
 
   Scenario: Create and edit page

diff --git a/tests/browser/features/main_page_links.feature b/tests/browser/features/main_page_links.feature
index 053ee62..561fe53 100644 (file)
--- a/tests/browser/features/main_page_links.feature
+++ b/tests/browser/features/main_page_links.feature
@@ -1,3 +1,4 @@
+@chrome @clean @en.wikipedia.beta.wmflabs.org @firefox @phantomjs @test2.wikipedia.org
 Feature: Main Page View History Links
 
   Background:

diff --git a/tests/browser/features/preferences.feature b/tests/browser/features/preferences.feature
index 2eb5de8..1a958bb 100644 (file)
--- a/tests/browser/features/preferences.feature
+++ b/tests/browser/features/preferences.feature
@@ -9,7 +9,7 @@
 # qa-browsertests top-level directory and at
 # https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/CREDITS
 #
-@chrome @en.wikipedia.beta.wmflabs.org @firefox @internet_explorer_6 @internet_explorer_7 @internet_explorer_8 @internet_explorer_9 @internet_explorer_10 @login @phantomjs @test2.wikipedia.org
+@chrome @clean @en.wikipedia.beta.wmflabs.org @firefox @internet_explorer_6 @internet_explorer_7 @internet_explorer_8 @internet_explorer_9 @internet_explorer_10 @login @phantomjs @test2.wikipedia.org
 Feature: Preferences
 
   Scenario: Preferences Appearance
@@ -25,7 +25,7 @@ Feature: Preferences
       And I can click Save
       And I can restore default settings
       And I can select date format
-      And I can see server time
+      And I can see time offset section
       And I can see local time
       And I can select my time zone
 

diff --git a/tests/browser/features/step_definitions/preferences_appearance_steps.rb b/tests/browser/features/step_definitions/preferences_appearance_steps.rb
index d3e275e..0046af6 100644 (file)
--- a/tests/browser/features/step_definitions/preferences_appearance_steps.rb
+++ b/tests/browser/features/step_definitions/preferences_appearance_steps.rb
@@ -18,7 +18,7 @@ When(/^I navigate to Preferences$/) do
 end
 
 Then(/^I can click Save$/) do
-  on(PreferencesAppearancePage).save_button_element.should exist
+  on(PreferencesPage).save_button_element.should exist
 end
 
 Then(/^I can restore default settings$/) do
@@ -26,12 +26,11 @@ Then(/^I can restore default settings$/) do
 end
 
 Then(/^I can see local time$/) do
-  @browser.text.should match Regexp.escape("Local time")
   on(PreferencesAppearancePage).local_time_span_element.should exist
 end
 
-Then(/^I can see server time$/) do
-  @browser.text.should match Regexp.escape("Server time")
+Then(/^I can see time offset section$/) do
+  on(PreferencesAppearancePage).time_offset_table_element.should be_visible
 end
 
 Then(/^I can select date format$/) do
@@ -49,7 +48,6 @@ Then(/^I can select image size$/) do
 end
 
 Then(/^I can select my time zone$/) do
-  @browser.text.should match Regexp.escape("Time zone")
   on(PreferencesAppearancePage) do |page|
     page.time_offset_select_element.should exist
     page.other_offset_element.should exist

diff --git a/tests/browser/features/support/pages/preferences_appearance_page.rb b/tests/browser/features/support/pages/preferences_appearance_page.rb
index c01aab4..e7b64cd 100644 (file)
--- a/tests/browser/features/support/pages/preferences_appearance_page.rb
+++ b/tests/browser/features/support/pages/preferences_appearance_page.rb
@@ -29,11 +29,11 @@ class PreferencesAppearancePage
   radio_button(:monobook, id: "mw-input-wpskin-monobook")
   radio_button(:no_preference_radio, id: "mw-input-wpdate-default")
   text_field(:other_offset, id: "mw-input-wptimecorrection-other")
-  a(:restore_default_link, text:/Restore all default settings/)
-  button(:save_button, text: "Save")
+  a(:restore_default_link, href: /reset/)
   select_list(:size_select, id: "mw-input-wpimagesize")
   select_list(:threshold_select, id: "mw-input-wpstubthreshold")
   select_list(:time_offset_select, id: "mw-input-wptimecorrection")
+  table(:time_offset_table, id: "mw-htmlform-timeoffset")
   select_list(:thumb_select, id: "mw-input-wpthumbsize")
   select_list(:underline_select, id: "mw-input-wpunderline")
   radio_button(:vector, id: "mw-input-wpskin-vector")

diff --git a/tests/browser/features/support/pages/preferences_page.rb b/tests/browser/features/support/pages/preferences_page.rb
index b581ca4..919ba27 100644 (file)
--- a/tests/browser/features/support/pages/preferences_page.rb
+++ b/tests/browser/features/support/pages/preferences_page.rb
@@ -15,14 +15,8 @@ class PreferencesPage
   include URL
   page_url URL.url("Special:Preferences")
 
-  a(:appearance_link, text: "Appearance")
-  a(:date_and_time_link, text: "Date and time")
-  a(:editing_link, text: "Editing")
-  a(:gadgets_link, text: "Gadgets")
-  a(:misc_link, text: "Misc")
-  a(:pending_changes_link, text: "Pending changes")
-  a(:recent_changes_link, text: "Recent changes")
-  a(:search_link, text: "Search")
-  a(:user_profile_link, text: "User profile")
-  a(:watchlist_link, text: "Watchlist")
+  a(:appearance_link, id: "preftab-rendering")
+  a(:editing_link, id: "preftab-editing")
+  a(:user_profile_link, id: "preftab-personal")
+  button(:save_button, id: "prefcontrol")
 end

diff --git a/tests/browser/features/view_history.feature b/tests/browser/features/view_history.feature
index 82bc813..7b42639 100644 (file)
--- a/tests/browser/features/view_history.feature
+++ b/tests/browser/features/view_history.feature
@@ -1,3 +1,4 @@
+@chrome @clean @en.wikipedia.beta.wmflabs.org @firefox @phantomjs @test2.wikipedia.org
 Feature: View History
 
   Scenario: Edit page and view history