JGirault has uploaded a new change for review.
https://gerrit.wikimedia.org/r/276079
Change subject: Merge remote-tracking branch 'origin/master' into HEAD
......................................................................
Merge remote-tracking branch 'origin/master' into HEAD
- Fixes conflicts in gulpfile.js
- Fixes tests/casper.js (search section)
Change-Id: I546914f3c011ab426c3a0fad48fd300acc36a4ca
---
M gulpfile.js
M prod/wikipedia.org/index.html
M tests/casper.js
3 files changed, 14 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/portals
refs/changes/79/276079/1
diff --git a/gulpfile.js b/gulpfile.js
index 5fccd35..22f28bd 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -60,25 +60,26 @@
}
}
-function getBaseDir() {
+var getBaseDir, getProdDir, getConfig;
+getBaseDir = function () {
requirePortalParam();
getBaseDir = function () {
return 'dev/' + portalParam + '/';
};
return getBaseDir();
-}
+};
-function getProdDir() {
+getProdDir = function () {
requirePortalParam();
getProdDir = function () {
return 'prod/' + portalParam + '/';
};
return getProdDir();
-}
+};
-function getConfig() {
+getConfig = function () {
var config = {},
baseDir, prodDir;
@@ -142,7 +143,7 @@
return config;
};
return getConfig();
-}
+};
/* List of tasks
=========================================================================== */
@@ -170,11 +171,7 @@
requirePortalParam();
-<<<<<<< HEAD (08339a Replace the custom dropdown with a native <select>
element.)
- return gulp.src( [ baseDir + 'assets/postcss/*.css', '!' + baseDir +
'assets/postcss/_*.css' ] )
-=======
- return gulp.src( getBaseDir() + 'assets/cssnext/style.css' )
->>>>>>> BRANCH (6aa1b9 Merge "Disabling broken language search.")
+ return gulp.src( [ getBaseDir() + 'assets/postcss/*.css', '!' +
getBaseDir() + 'assets/postcss/_*.css' ] )
.pipe( plugins.postcss( [
postCSSImport(),
postCSSNext(),
@@ -190,20 +187,13 @@
* Inlines assets of index.html in dev folder,
* moves index.html into prod folder
*/
-<<<<<<< HEAD (08339a Replace the custom dropdown with a native <select>
element.)
gulp.task( 'inline-assets', [ 'compile-handlebars', 'postcss' ], function () {
- return gulp.src( config.inline.src )
- .pipe( plugins.inline( config.inline.options ) )
- .pipe( gulp.dest( prodDir ) );
-=======
-gulp.task( 'inline-assets', [ 'compile-handlebars', 'cssnext' ], function () {
requirePortalParam();
return gulp.src( getConfig().inline.src )
.pipe( plugins.inline( getConfig().inline.options ) )
.pipe( gulp.dest( getProdDir() ) );
->>>>>>> BRANCH (6aa1b9 Merge "Disabling broken language search.")
} );
/**
@@ -263,20 +253,13 @@
* - postCSS files
* into dev folder.
*/
-<<<<<<< HEAD (08339a Replace the custom dropdown with a native <select>
element.)
-gulp.task( 'watch', [ 'build', 'compile-handlebars', 'sprite', 'postcss' ],
function () {
- gulp.watch( config.watch.hb, [ 'compile-handlebars' ] );
- gulp.watch( config.watch.sprites, [ 'sprite' ] );
- gulp.watch( config.watch.postcss, [ 'postcss' ] );
-=======
-gulp.task( 'watch', [ 'compile-handlebars', 'sprite', 'cssnext' ], function ()
{
+gulp.task( 'watch', [ 'compile-handlebars', 'sprite', 'postcss' ], function ()
{
requirePortalParam();
gulp.watch( getConfig().watch.hb, [ 'compile-handlebars' ] );
gulp.watch( getConfig().watch.sprites, [ 'sprite' ] );
- gulp.watch( getConfig().watch.cssnext, [ 'cssnext' ] );
->>>>>>> BRANCH (6aa1b9 Merge "Disabling broken language search.")
+ gulp.watch( getConfig().watch.postcss, [ 'postcss' ] );
} );
/**
@@ -349,10 +332,6 @@
.pipe( plugins[ 'if' ]( '*.png', gulp.dest( getBaseDir() +
'assets/img/' ), gulp.dest( getBaseDir() + 'assets/css/' ) ) );
} );
-<<<<<<< HEAD (08339a Replace the custom dropdown with a native <select>
element.)
-gulp.task( 'default', [ 'build', 'lint', 'compile-handlebars', 'sprite',
'postcss', 'inline-assets', 'clean-prod-js', 'concat-minify-js', 'minify-html',
'optimize-images' ] );
-=======
-gulp.task( 'default', [ 'lint', 'compile-handlebars', 'sprite', 'cssnext',
'inline-assets', 'clean-prod-js', 'concat-minify-js', 'minify-html',
'optimize-images' ] );
->>>>>>> BRANCH (6aa1b9 Merge "Disabling broken language search.")
+gulp.task( 'default', [ 'lint', 'compile-handlebars', 'sprite', 'postcss',
'inline-assets', 'clean-prod-js', 'concat-minify-js', 'minify-html',
'optimize-images' ] );
gulp.task( 'test', [ 'lint' ] );
diff --git a/prod/wikipedia.org/index.html b/prod/wikipedia.org/index.html
index 458d611..85b7504 100644
--- a/prod/wikipedia.org/index.html
+++ b/prod/wikipedia.org/index.html
@@ -650,4 +650,4 @@
}</style>
<![endif]>
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/tests/casper.js b/tests/casper.js
index bd57d12..1ba9e9a 100644
--- a/tests/casper.js
+++ b/tests/casper.js
@@ -50,8 +50,8 @@
},
search: {
eventTest: elTests.submitEvent,
- sectionSelector: 'form.search-form',
- clickSelector: 'form.search-form
button.formBtn',
+ sectionSelector: 'form#search-form',
+ clickSelector: 'form#search-form
button[type=submit]',
eventCount: 0,
eventData: [],
formFields: {
--
To view, visit https://gerrit.wikimedia.org/r/276079
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I546914f3c011ab426c3a0fad48fd300acc36a4ca
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/portals
Gerrit-Branch: search-box
Gerrit-Owner: JGirault <jgira...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
