From aee7848706bf7937f7b4c7a65737c3de64604402 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Mon, 26 Jun 2017 16:20:41 +0900
Subject: [PATCH] =?UTF-8?q?setQuery()=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/unittest/unittest_common.html | 67 +++++++++++++++----------
 1 file changed, 40 insertions(+), 27 deletions(-)

diff --git a/common/js/unittest/unittest_common.html b/common/js/unittest/unittest_common.html
index f073a9c8f..1e5e56ddb 100644
--- a/common/js/unittest/unittest_common.html
+++ b/common/js/unittest/unittest_common.html
@@ -8,64 +8,77 @@
 <script type="text/javascript" src="JSSpec/diff_match_patch.js"></script>
 <script type="text/javascript" src="../jquery.js"></script>
 <script type="text/javascript" src="../common.js"></script>
+<script>
+var current_url = 'http://xpressengine.com/';
+var http_port = 80;
+var https_port = 443;
+var enforce_ssl = false;
+</script>
 <script type="text/javascript">// <![CDATA[
 describe('SetQuery', {
     'should satisfy basic uri condition' : function() {
         target = "http://xpressengine.com/";
-        value_of(target.setQuery("q","r")).should_be("http://xpressengine.com/?q=r");
+        value_of(target.setQuery("q","r")).should_be("http://xpressengine.com/index.php?q=r");
     },
     'should work when ssl is on' : function() {
         target = "http://xpressengine.com/";
-        ssl_actions = new Array("dispLogin");
-        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com/?act=dispLogin");
+        window.ssl_actions = new Array("dispLogin");
+        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com/index.php?act=dispLogin");
     },
     'should work when ssl is on and https_port is set (not 443)' : function() {
         target = "http://xpressengine.com/";
-        https_port = 445;
-        ssl_actions = new Array("dispLogin");
-        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com:445/?act=dispLogin");
+        window.https_port = 445;
+        window.ssl_actions = new Array("dispLogin");
+        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com:445/index.php?act=dispLogin");
     },
     'should work when ssl is on and https_port is set as 443' : function() {
         target = "http://xpressengine.com/";
-        https_port = 443;
-        ssl_actions = new Array("dispLogin");
-        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com/?act=dispLogin");
+        window.https_port = 443;
+        window.ssl_actions = new Array("dispLogin");
+        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com/index.php?act=dispLogin");
     },
     'should replace https to http if act is not a member of ssl_actions': function() {
         targets = "https://xpressengine.com/";
-        ssl_actions = new Array("dispLogin");
-        value_of(targets.setQuery("act","dispLogin2")).should_be("http://xpressengine.com/?act=dispLogin2");
+        window.ssl_actions = new Array("dispLogin");
+        value_of(targets.setQuery("act","dispLogin2")).should_be("http://xpressengine.com/index.php?act=dispLogin2");
     },
     'should remove https port' : function() {
-        targetsp = "https://xpressengine.com:443/?q=r";
-        value_of(targetsp.setQuery("act","dispLogin2")).should_be("http://xpressengine.com/?q=r&act=dispLogin2");
+        targetsp = "https://xpressengine.com:443/index.php?q=r";
+        value_of(targetsp.setQuery("act","dispLogin2")).should_be("http://xpressengine.com/index.php?q=r&act=dispLogin2");
     },
     'should remove https port and add http port if http port is defined' : function() {
-        targetsp = "https://xpressengine.com:443/?q=r";
-        http_port = 8000;
-        value_of(targetsp.setQuery("act","dispLogin2")).should_be("http://xpressengine.com:8000/?q=r&act=dispLogin2");
+        targetsp = "https://xpressengine.com:443/index.php?q=r";
+        window.http_port = 8080;
+        value_of(targetsp.setQuery("act","dispLogin2")).should_be("http://xpressengine.com:8080/index.php?q=r&act=dispLogin2");
     },
     'should only remove https port and if http port is defined as 80' : function() {
-        targetsp = "https://xpressengine.com:443/?q=r";
-        http_port = 80;
-        value_of(targetsp.setQuery("act","dispLogin2")).should_be("http://xpressengine.com/?q=r&act=dispLogin2");
+        targetsp = "https://xpressengine.com:443/index.php?q=r";
+        window.http_port = 80;
+        value_of(targetsp.setQuery("act","dispLogin2")).should_be("http://xpressengine.com/index.php?q=r&act=dispLogin2");
     },
     'should work if enforce_ssl is set' : function() {
         target = "http://xpressengine.com/";
-        enforce_ssl = true;
-        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com/?act=dispLogin");
+        window.enforce_ssl = true;
+        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com/index.php?act=dispLogin");
+    },
+    'should work if enforce_ssl is set' : function() {
+        target = "https://xpressengine.com:4433/";
+        window.http_port = 8080;
+        window.https_port = 4433;
+        window.enforce_ssl = false;
+        value_of(target.setQuery("act","dispTest")).should_be("http://xpressengine.com:8080/index.php?act=dispTest");
     },
     'should work if enforce_ssl is set with 443 port' : function() {
         target = "http://xpressengine.com/";
-        enforce_ssl = true;
-        https_port = 443;
-        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com/?act=dispLogin");
+        window.enforce_ssl = true;
+        window.https_port = 443;
+        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com/index.php?act=dispLogin");
     },
     'should work if enforce_ssl is set with none-443 port' : function() {
         target = "http://xpressengine.com/";
-        enforce_ssl = true;
-        https_port = 445;
-        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com:445/?act=dispLogin");
+        window.enforce_ssl = true;
+        window.https_port = 445;
+        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com:445/index.php?act=dispLogin");
     }
 })
 // ]]></script>