jenkins-bot has submitted this change and it was merged.

Change subject: UserTest: Don't rely on the behavior of unknown user options
......................................................................


UserTest: Don't rely on the behavior of unknown user options

They are not actually expected to be preserved, although they might be.

Change-Id: I34e15f3d1e5b9b825e6fc14814c8e9a6ac151ce9
---
M tests/phpunit/includes/UserTest.php
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Hoo man: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/phpunit/includes/UserTest.php 
b/tests/phpunit/includes/UserTest.php
index 933fed0..5be1b96 100644
--- a/tests/phpunit/includes/UserTest.php
+++ b/tests/phpunit/includes/UserTest.php
@@ -250,12 +250,12 @@
                $user = User::newFromName( 'UnitTestUser' );
                $user->addToDatabase();
 
-               $user->setOption( 'someoption', 'test' );
+               $user->setOption( 'userjs-someoption', 'test' );
                $user->setOption( 'cols', 200 );
                $user->saveSettings();
 
                $user = User::newFromName( 'UnitTestUser' );
-               $this->assertEquals( 'test', $user->getOption( 'someoption' ) );
+               $this->assertEquals( 'test', $user->getOption( 
'userjs-someoption' ) );
                $this->assertEquals( 200, $user->getOption( 'cols' ) );
        }
 
@@ -266,9 +266,9 @@
         */
        public function testAnonOptions() {
                global $wgDefaultUserOptions;
-               $this->user->setOption( 'someoption', 'test' );
+               $this->user->setOption( 'userjs-someoption', 'test' );
                $this->assertEquals( $wgDefaultUserOptions['cols'], 
$this->user->getOption( 'cols' ) );
-               $this->assertEquals( 'test', $this->user->getOption( 
'someoption' ) );
+               $this->assertEquals( 'test', $this->user->getOption( 
'userjs-someoption' ) );
        }
 
        /**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I34e15f3d1e5b9b825e6fc14814c8e9a6ac151ce9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz DziewoƄski <matma....@gmail.com>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to