Merge pull request playframework#229 from shelajev/lighthouse-419-patch

[playframework#419] Fix autotest http protocol & port configuration

Author: pepite

framework/pym/play/commands/base.py

@@ -178,7 +178,13 @@ def autotest(app, args):
     print "~"
 
     # Kill if exists
-    http_port = app.readConf('http.port')
+    http_port = 9000
+    protocol = 'http'
+    if app.readConf('https.port'):
+        http_port = app.readConf('https.port')
+        protocol = 'https'
+    else:
+        http_port = app.readConf('http.port')
     try:
         proxy_handler = urllib2.ProxyHandler({})
         opener = urllib2.build_opener(proxy_handler)
@@ -222,7 +228,7 @@ def autotest(app, args):
     cp_args = ':'.join(fpcp)
     if os.name == 'nt':
         cp_args = ';'.join(fpcp)    
-    java_cmd = [app.java_path(), '-classpath', cp_args, '-Dapplication.url=http://localhost:%s' % http_port, 'play.modules.testrunner.FirePhoque']    
+    java_cmd = [app.java_path(), '-classpath', cp_args, '-Dapplication.url=%s://localhost:%s' % (protocol, http_port), 'play.modules.testrunner.FirePhoque']
     try:
         subprocess.call(java_cmd, env=os.environ)
     except OSError:
@@ -243,7 +249,7 @@ def autotest(app, args):
     try:
         proxy_handler = urllib2.ProxyHandler({})
         opener = urllib2.build_opener(proxy_handler)
-        opener.open('http://localhost:%s/@kill' % http_port)
+        opener.open('%s://localhost:%s/@kill' % (protocol, http_port))
     except Exception, e:
         pass
 

modules/testrunner/app/views/TestRunner/index.html

@@ -371,7 +371,17 @@
                         });
                     }
                     if(/.test.html/.test(testId)) {
-                        $('#selenium-runner').attr('src', '@{'/public/test-runner/selenium/TestRunner.html'}?baseUrl=http://localhost:${play.configuration['http.port'] ?: '9000'}&test=/@tests/'+testId+'.suite&auto=true&close=true&resultsUrl=/@tests/'+testId);
+                        %{
+                            protocol = "http";
+                            port = 9000;
+                            if(play.configuration['https.port'] != null) {
+                                port = play.configuration['https.port'];
+                                protocol = "https";
+                            } else if (play.configuration['http.port'] != null) {
+                                port = play.configuration['http.port'];
+                            }
+                        }%
+                        $('#selenium-runner').attr('src', '@{'/public/test-runner/selenium/TestRunner.html'}?baseUrl=${protocol}://localhost:${port}&test=/@tests/'+testId+'.suite&auto=true&close=true&resultsUrl=/@tests/'+testId);
                         $('#selenium-mask, #selenium').show();
                         window.checkResult = setInterval(function() {
                              var req = $.ajax({url: '@{TestRunner.run("XXX.result")}'.replace('XXX', testId), async: false});
@@ -607,10 +617,20 @@ <h2><span>${tis ? '' : 'There '+functionalTests.size().pluralize('is', 'are')} $
             #{if seleniumTests}
             <h2><span>${tis ? '' : 'There '+seleniumTests.size().pluralize('is', 'are')} ${tis ? 'and' : ''} ${seleniumTests.size()} selenium test${seleniumTests.size().pluralize()},</span></h2>
             <ul>
+                %{
+                    protocol = "http";
+                    port = 9000;
+                    if(play.configuration['https.port'] != null) {
+                        port = play.configuration['https.port'];
+                        protocol = "https";
+                    } else if (play.configuration['http.port'] != null) {
+                        port = play.configuration['http.port'];
+                    }
+                }%
                 #{list items:seleniumTests, as:'test'}
                 <li>
                     <div class="test" id="${test}">
-                        <span class="touch">+</span><a href="@{'/public/test-runner/selenium/TestRunner.html'}?baseUrl=http://localhost:${play.configuration['http.port'] ?: '9000'}&test=/@tests/${test}.suite">${test.replace('.test.html','')}</a>
+                        <span class="touch">+</span><a href="@{'/public/test-runner/selenium/TestRunner.html'}?baseUrl=${protocol}://localhost:${port}&test=/@tests/${test}.suite">${test.replace('.test.html','')}</a>
                         <div class="testResult"></div>
                     </div>
                 </li>

modules/testrunner/src/play/modules/testrunner/FirePhoque.java

@@ -47,7 +47,7 @@ public static void main(String[] args) throws Exception {
             }
             in.close();
         } catch(Exception e) {
-            System.out.println("~ The application does not start. There are compilation errors.");
+            System.out.println("~ The application does not start. There are errors: " + e);
             System.exit(-1);
         }
 

modules/testrunner/src/play/modules/testrunner/TestRunnerPlugin.java

@@ -33,8 +33,16 @@ public void onRoutesLoaded() {
 
     @Override
     public void onApplicationReady() {
+        String protocol = "http";
+        String port = "9000";
+        if(Play.configuration.getProperty("https.port") != null) {
+            port = Play.configuration.getProperty("https.port");
+            protocol = "https";
+        } else if(Play.configuration.getProperty("http.port") != null) {
+          port = Play.configuration.getProperty("http.port");
+        }
         System.out.println("~");
-        System.out.println("~ Go to http://localhost:" + Play.configuration.getProperty("http.port", "9000") + "/@tests to run the tests");
+        System.out.println("~ Go to "+protocol+"://localhost:" + port + "/@tests to run the tests");
         System.out.println("~");
     }