Changeset 1644

Show
Ignore:
Timestamp:
06/20/08 11:52:27 (4 months ago)
Author:
mikey
Message:

delay page selection after running preinterceptors, this enables changing the requested page within a preinterceptor
(tests only, changes to classes already erroneously committed in r1632)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/test/php/net/stubbles/websites/processors/stubAbstractProcessorResolverTestCase.php

    r1447 r1644  
    121121                                        ->will($this->returnValue(null)); 
    122122        $processor = $this->abstractProcessorResolver->resolve($this->mockRequest, $this->mockSession, $this->mockResponse); 
     123        $this->abstractProcessorResolver->selectPage($processor); 
    123124    } 
    124125 
    …… 
    139140                                        ->will($this->returnValue('stdClass')); 
    140141        $processor = $this->abstractProcessorResolver->resolve($this->mockRequest, $this->mockSession, $this->mockResponse); 
     142        $this->abstractProcessorResolver->selectPage($processor); 
    141143    } 
    142144 
    …… 
    157159                                        ->will($this->returnValue($pageFactoryClass)); 
    158160        $processor = $this->abstractProcessorResolver->resolve($this->mockRequest, $this->mockSession, $this->mockResponse); 
     161        $this->abstractProcessorResolver->selectPage($processor); 
    159162        $this->assertType('FooPageBasedProcessor', $processor); 
    160163        $this->assertSame($this->mockRequest, $processor->getRequest()); 

  • trunk/src/test/php/net/stubbles/websites/stubFrontControllerTestCase.php

    r1533 r1644  
    310310        $this->mockProcessor->expects($this->any())->method('forceSSL')->will($this->returnValue(true)); 
    311311        $this->mockProcessor->expects($this->any())->method('isSSL')->will($this->returnValue(false)); 
    312         $this->mockInterceptorInitializer->expects($this->never()) 
    313                                          ->method('getPreInterceptors'); 
     312        $this->mockInterceptorInitializer->expects($this->once()) 
     313                                         ->method('getPreInterceptors') 
     314                                         ->will($this->returnValue(array())); 
    314315        $this->mockInterceptorInitializer->expects($this->never()) 
    315316                                         ->method('getPostInterceptors');