Merge "mw.ForeignApi: don’t set origin for same-origin requests"

[lhc/web/wiklou.git] / tests / phpunit / includes / specials / SpecialPageDataTest.php

diff --git a/tests/phpunit/includes/specials/SpecialPageDataTest.php b/tests/phpunit/includes/specials/SpecialPageDataTest.php
index 7569d63..4075406 100644 (file)
--- a/tests/phpunit/includes/specials/SpecialPageDataTest.php
+++ b/tests/phpunit/includes/specials/SpecialPageDataTest.php
@@ -2,12 +2,9 @@
 
 /**
  * @covers SpecialPageData
- *
  * @group Database
- *
  * @group SpecialPage
  *
- * @license GPL-2.0+
  * @author Daniel Kinzler
  */
 class SpecialPageDataTest extends SpecialPageTestBase {
@@ -30,31 +27,16 @@ class SpecialPageDataTest extends SpecialPageTestBase {
 
                $cases['Only title specified'] = [
                        '',
-                       [ 'title' => 'Helsinki' ],
+                       [ 'target' => 'Helsinki' ],
                        [],
                        '!!',
                        303,
                        [ 'Location' => '!.+!' ]
                ];
 
-               $subpageCases = [];
-               foreach ( $cases as $c ) {
-                       $case = $c;
-                       $case[0] = '';
-
-                       if ( isset( $case[1]['title'] ) ) {
-                               $case[0] .= $case[1]['title'];
-                               unset( $case[1]['title'] );
-                       }
-
-                       $subpageCases[] = $case;
-               }
-
-               $cases = array_merge( $cases, $subpageCases );
-
                $cases['Accept only HTML'] = [
                        '',
-                       [ 'title' => 'Helsinki' ],
+                       [ 'target' => 'Helsinki' ],
                        [ 'Accept' => 'text/HTML' ],
                        '!!',
                        303,
@@ -64,7 +46,7 @@ class SpecialPageDataTest extends SpecialPageTestBase {
                $cases['Accept only HTML with revid'] = [
                        '',
                        [
-                               'title' => 'Helsinki',
+                               'target' => 'Helsinki',
                                'revision' => '4242',
                        ],
                        [ 'Accept' => 'text/HTML' ],
@@ -74,7 +56,16 @@ class SpecialPageDataTest extends SpecialPageTestBase {
                ];
 
                $cases['Nothing specified'] = [
-                       'Helsinki',
+                       'main/Helsinki',
+                       [],
+                       [],
+                       '!!',
+                       303,
+                       [ 'Location' => '!Helsinki&action=raw!' ]
+               ];
+
+               $cases['Nothing specified'] = [
+                       '/Helsinki',
                        [],
                        [],
                        '!!',
@@ -83,7 +74,7 @@ class SpecialPageDataTest extends SpecialPageTestBase {
                ];
 
                $cases['Invalid Accept header'] = [
-                       'Helsinki',
+                       'main/Helsinki',
                        [],
                        [ 'Accept' => 'text/foobar' ],
                        '!!',
@@ -146,7 +137,7 @@ class SpecialPageDataTest extends SpecialPageTestBase {
                list( $output, ) = $this->executeSpecialPage( '', $request );
 
                $this->assertContains(
-                       "Content negotiation applies based on you client's Accept header.",
+                       "Content negotiation applies based on your client's Accept header.",
                        $output,
                        "output"
                );