Merge branch 'master' of gitllab.org:opacce-svn-bridge

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

application/modules/opac/controllers/CasServerController.php

@@ -90,8 +90,9 @@ class CasServerController extends Zend_Controller_Action {
 	}
 
 	function validateMusicmeAction() {
+		xdebug_break();
 		$bibid=$this->_request->getParam('MediaLibraryID');
-		$ticket=$this->_request->getParam('SessionID');
+		$ticket=$this->_request->getParam('ticket');
 
 		if (strlen($ticket)<1 || strlen($bibid)<1) {
 			return $this->returnMusicMeFailureTicketResponse('INVALID_REQUEST');

tests/application/modules/opac/controllers/CasServerControllerTest.php

@@ -74,14 +74,14 @@ class CasServerControllerMusicMeValidateActionTest extends AbstractControllerTes
 	
 	/** @test */
 	public function requestMusicMeWithNoTicketShouldRespondAccountDisabledXML() {		
-		$this->dispatch('/opac/cas-server/validate-musicme?MediaLibraryID=150&SessionID=0a1b2c3d');
+		$this->dispatch('/opac/cas-server/validate-musicme?MediaLibraryID=150&ticket=0a1b2c3d');
 		$this->assertContains('<User />',$this->_response->getBody());
 	}
 
 
 	/** @test */
 	public function requestMusicMeWithExpiredTicketShouldRespondInvalidTicketFailureXML() {		
-		$this->dispatch('/opac/cas-server/validate-musicme?MediaLibraryID=STmarchepo&SessionID=28282');
+		$this->dispatch('/opac/cas-server/validate-musicme?MediaLibraryID=STmarchepo&ticket=28282');
 		// $this->assertContains('<AccountExpired>true',$this->_response->getBody());
 	}
 
@@ -89,7 +89,7 @@ class CasServerControllerMusicMeValidateActionTest extends AbstractControllerTes
 	/** @test */
 	public function requestMusicMeWithValidTicketShouldRespondValidXML() {		
 	
-		$this->dispatch('/opac/cas-server/validate-musicme?SessionID='.md5(Zend_Session::getId()).'&MediaLibraryID=http://test.com');
+		$this->dispatch('/opac/cas-server/validate-musicme?ticket='.md5(Zend_Session::getId()).'&MediaLibraryID=http://test.com');
 		$this->assertContains('<ID>',$this->_response->getBody());
 
 	}