Merge branch 'jelix-1.3.x' into jelix-1.4.x

Conflicts: testapp/modules/jelix_tests/tests/core.urls_generation.html.php
jelix · Mar 21, 2013 · bea2d37 · bea2d37
2 parents 55d02fc + d22eec8
commit bea2d37
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/testapp/modules/jelix_tests/tests/core.urls_generation.html.php b/testapp/modules/jelix_tests/tests/core.urls_generation.html.php
@@ -781,7 +781,8 @@ function testGetCurrentUrl() {
         $req = jApp::coord()->request = new jClassicRequest();
         $req->init();
         $req->params = array('module'=>'jelix_tests', 'action'=>'urlsig:bug1488', 'var'=>'yo');
-
+        $req->getModuleAction();
+
         $url = jUrl::getCurrentUrl(false, false);
         $this->assertEqual('/noep.php/jelix_tests/urlsig/bug1488?var=yo', $url);
 
@@ -818,11 +819,13 @@ function testGetCurrentUrl() {
         $req = jApp::coord()->request = new jClassicRequest();
         $req->init();
         $req->params = array('module'=>'jelix_tests', 'action'=>'urlsig:bug1488', 'var'=>'yo', 'foo'=>'bar');
+        $req->getModuleAction();
 
         $url = jUrl::getCurrentUrl(false, false);
         $this->assertEqual('/zip/yo/?foo=bar', $url);
 
         $url = jUrl::getCurrentUrl(false, true);
         $this->assertEqual('http://testapp.local/zip/yo/?foo=bar', $url);
+
     }
 }