[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.28.0-wmf.22]: mw.loader: Fix off-by-one error in splitModuleKey()

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

Change subject: mw.loader: Fix off-by-one error in splitModuleKey()
..


mw.loader: Fix off-by-one error in splitModuleKey()

Follows-up 45bec76. This caused most localStorage cache entries from
mw.loader.store to be ignored because it'd store tje source code with
a version string that wrongly started with an "@".

As such, on the next page view, when comparing against the version
string from the startup manifest, it would mismatch and eventually
be pruned by mw.loader.store.

Change-Id: If14c80989c0bb28b7b209abe89f83d585c563987
---
M resources/src/mediawiki/mediawiki.js
M tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
2 files changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/src/mediawiki/mediawiki.js 
b/resources/src/mediawiki/mediawiki.js
index 6b23439..484930a 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -1725,7 +1725,7 @@
}
return {
name: key.slice( 0, index ),
-   version: key.slice( index )
+   version: key.slice( index + 1 )
};
}
 
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js 
b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
index bfac513..7233a2e 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
@@ -639,6 +639,8 @@
return mw.loader.using( 'test.stale' )
.then( function () {
assert.strictEqual( count, 1 );
+   // After implementing, registry contains 
version as implemented by the response.
+   assert.strictEqual( mw.loader.getVersion( 
'test.stale' ), 'v1', 'Override version' );
assert.strictEqual( mw.loader.getState( 
'test.stale' ), 'ready' );
assert.ok( mw.loader.store.get( 'test.stale' ), 
'In store' );
} )

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If14c80989c0bb28b7b209abe89f83d585c563987
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.22
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.28.0-wmf.22]: mw.loader: Fix off-by-one error in splitModuleKey()

2016-10-24 Thread Ori.livneh (Code Review) 
Ori.livneh has uploaded a new change for review.

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

Change subject: mw.loader: Fix off-by-one error in splitModuleKey()
..

mw.loader: Fix off-by-one error in splitModuleKey()

Follows-up 45bec76. This caused most localStorage cache entries from
mw.loader.store to be ignored because it'd store tje source code with
a version string that wrongly started with an "@".

As such, on the next page view, when comparing against the version
string from the startup manifest, it would mismatch and eventually
be pruned by mw.loader.store.

Change-Id: If14c80989c0bb28b7b209abe89f83d585c563987
---
M resources/src/mediawiki/mediawiki.js
M tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
2 files changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/43/317743/1

diff --git a/resources/src/mediawiki/mediawiki.js 
b/resources/src/mediawiki/mediawiki.js
index 6b23439..484930a 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -1725,7 +1725,7 @@
}
return {
name: key.slice( 0, index ),
-   version: key.slice( index )
+   version: key.slice( index + 1 )
};
}
 
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js 
b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
index bfac513..7233a2e 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
@@ -639,6 +639,8 @@
return mw.loader.using( 'test.stale' )
.then( function () {
assert.strictEqual( count, 1 );
+   // After implementing, registry contains 
version as implemented by the response.
+   assert.strictEqual( mw.loader.getVersion( 
'test.stale' ), 'v1', 'Override version' );
assert.strictEqual( mw.loader.getState( 
'test.stale' ), 'ready' );
assert.ok( mw.loader.store.get( 'test.stale' ), 
'In store' );
} )

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If14c80989c0bb28b7b209abe89f83d585c563987
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.22
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Krinkle 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits