merged with 2.1

Author: DavertMik

tests/data/app/controllers.php

@@ -91,6 +91,12 @@ function GET() {
  }
 }
 
+class location_201 {
+ function GET() {
+ header('Location: /info', true, 201);
+ }
+}
+
 class external_url {
  function GET() {
  include __DIR__ . '/view/external_url.php';

tests/data/app/index.php

@@ -27,6 +27,7 @@
  '/redirect_interval' => 'redirect_interval',
  '/redirect_header_interval' => 'redirect_header_interval',
  '/redirect_meta_refresh' => 'redirect_meta_refresh',
+ '/location_201' => 'location_201',
  '/relative_redirect' => 'redirect_relative',
  '/relative/redirect' => 'redirect_relative',
  '/redirect_twice' => 'redirect_twice',

tests/unit/Codeception/Module/PhpBrowserTest.php

@@ -242,6 +242,13 @@ public function testRedirectLimitNotReached()
  $this->module->seeCurrentUrlEquals('/info');
  }
 
+ public function testLocationHeaderDoesNotRedirectWhenStatusCodeIs201()
+ {
+ $this->module->amOnPage('/location_201');
+ $this->module->seeResponseCodeIs(201);
+ $this->module->seeCurrentUrlEquals('/location_201');
+ }
+
  public function testSetCookieByHeader()
  {
  $this->module->amOnPage('/cookies2');

tests/unit/Codeception/Module/TestsForWeb.php

@@ -93,11 +93,48 @@ public function testSeeInCurrentUrl()
 
  public function testSeeLink()
  {
- $this->module->amOnPage('/');
- $this->module->seeLink('More info');
- $this->module->dontSeeLink('/info');
- $this->module->dontSeeLink('#info');
- $this->module->seeLink('More', '/info');
+ $this->module->amOnPage('/external_url');
+ $this->module->seeLink('Next');
+ $this->module->seeLink('Next', 'http://codeception.com/');
+ }
+
+ public function testDontSeeLink()
+ {
+ $this->module->amOnPage('/external_url');
+ $this->module->dontSeeLink('Back');
+ $this->module->dontSeeLink('Next', '/fsdfsdf/');
+ }
+
+ public function testSeeLinkFailsIfTextDoesNotMatch()
+ {
+ $this->setExpectedException('PHPUnit_Framework_AssertionFailedError',
+ "No links containing text 'Codeception' were found in page /external_url");
+ $this->module->amOnPage('/external_url');
+ $this->module->seeLink('Codeception');
+ }
+
+ public function testSeeLinkFailsIfHrefDoesNotMatch()
+ {
+ $this->setExpectedException('PHPUnit_Framework_AssertionFailedError',
+ "No links containing text 'Next' and URL '/fsdfsdf/' were found in page /external_url");
+ $this->module->amOnPage('/external_url');
+ $this->module->seeLink('Next', '/fsdfsdf/');
+ }
+
+ public function testDontSeeLinkFailsIfTextMatches()
+ {
+ $this->setExpectedException('PHPUnit_Framework_AssertionFailedError',
+ "Link containing text 'Next' was found in page /external_url");
+ $this->module->amOnPage('/external_url');
+ $this->module->dontSeeLink('Next');
+ }
+
+ public function testDontSeeLinkFailsIfTextAndUrlMatches()
+ {
+ $this->setExpectedException('PHPUnit_Framework_AssertionFailedError',
+ "Link containing text 'Next' and URL 'http://codeception.com/' was found in page /external_url");
+ $this->module->amOnPage('/external_url');
+ $this->module->dontSeeLink('Next', 'http://codeception.com/');
  }
 
  public function testClick()