summaryrefslogtreecommitdiffstats
path: root/askbot/tests
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2013-05-19 21:55:40 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2013-05-19 21:55:40 -0400
commitfd2979fa38868aaad5385c4eed30996d12142a5e (patch)
tree2ab7679e50f9d3f7504f6b9b957737123623afc7 /askbot/tests
parentbd44f687041b19a2c88b21ce265f4939fc1de930 (diff)
downloadaskbot-fd2979fa38868aaad5385c4eed30996d12142a5e.tar.gz
askbot-fd2979fa38868aaad5385c4eed30996d12142a5e.tar.bz2
askbot-fd2979fa38868aaad5385c4eed30996d12142a5e.zip
added an optional service url prefix to later support namespaces
Diffstat (limited to 'askbot/tests')
-rw-r--r--askbot/tests/search_state_tests.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/askbot/tests/search_state_tests.py b/askbot/tests/search_state_tests.py
index 27622629..44074441 100644
--- a/askbot/tests/search_state_tests.py
+++ b/askbot/tests/search_state_tests.py
@@ -54,11 +54,11 @@ class SearchStateTests(AskbotTestCase):
user_logged_in=False
)
self.assertEqual(
- 'scope:unanswered/sort:age-desc/query:alfa/tags:miki,mini/author:12/page:2/',
+ 'scope:unanswered/sort:age-desc/tags:miki,mini/author:12/page:2/query:alfa/',
ss.query_string()
)
self.assertEqual(
- 'scope:unanswered/sort:age-desc/query:alfa/tags:miki,mini/author:12/page:2/',
+ 'scope:unanswered/sort:age-desc/tags:miki,mini/author:12/page:2/query:alfa/',
ss.deepcopy().query_string()
)
@@ -74,11 +74,11 @@ class SearchStateTests(AskbotTestCase):
user_logged_in=False
)
self.assertEqual(
- 'scope:all/sort:age-desc/query:alfa/tags:miki,mini/author:12/page:2/',
+ 'scope:all/sort:age-desc/tags:miki,mini/author:12/page:2/query:alfa/',
ss.query_string()
)
self.assertEqual(
- 'scope:all/sort:age-desc/query:alfa/tags:miki,mini/author:12/page:2/',
+ 'scope:all/sort:age-desc/tags:miki,mini/author:12/page:2/query:alfa/',
ss.deepcopy().query_string()
)
@@ -93,11 +93,11 @@ class SearchStateTests(AskbotTestCase):
user_logged_in=True
)
self.assertEqual(
- 'scope:followed/sort:age-desc/query:alfa/tags:miki,mini/author:12/page:2/',
+ 'scope:followed/sort:age-desc/tags:miki,mini/author:12/page:2/query:alfa/',
ss.query_string()
)
self.assertEqual(
- 'scope:followed/sort:age-desc/query:alfa/tags:miki,mini/author:12/page:2/',
+ 'scope:followed/sort:age-desc/tags:miki,mini/author:12/page:2/query:alfa/',
ss.deepcopy().query_string()
)
@@ -116,7 +116,7 @@ class SearchStateTests(AskbotTestCase):
user_logged_in=False
)
self.assertEqual(
- 'scope:all/sort:relevance-desc/query:hejho/tags:miki,mini/author:12/page:2/',
+ 'scope:all/sort:relevance-desc/tags:miki,mini/author:12/page:2/query:hejho/',
ss.query_string()
)
@@ -148,7 +148,7 @@ class SearchStateTests(AskbotTestCase):
user_logged_in=False
)
self.assertEqual(
- 'scope:all/sort:activity-desc/query:hejho/tags:miki,mini/author:12/page:2/',
+ 'scope:all/sort:activity-desc/tags:miki,mini/author:12/page:2/query:hejho/',
ss.query_string()
)
@@ -157,7 +157,7 @@ class SearchStateTests(AskbotTestCase):
def test_query_escaping(self):
ss = self._ss(query=' alfa miki maki +-%#?= lalala/: ') # query coming from URL is already unescaped
- qs = 'scope:all/sort:activity-desc/query:alfa%20miki%20maki%20+-%25%23%3F%3D%20lalala%2F%3A/page:1/'
+ qs = 'scope:all/sort:activity-desc/page:1/query:alfa%20miki%20maki%20+-%25%23%3F%3D%20lalala%2F%3A/'
self.assertEqual(qs, ss.query_string())
self.assertEqual(qs, ss.deepcopy().query_string())
@@ -180,7 +180,7 @@ class SearchStateTests(AskbotTestCase):
self.assertEqual(ss.stripped_query, ss.deepcopy().stripped_query)
self.assertEqual(
- 'scope:all/sort:activity-desc/query:%22%40anna%20haha%20%40%22maria%20fernanda%22%20%40%27diego%20maradona%27%20hehe%20%5Buser%3Akarl%20%20marx%5D%20hoho%20%20user%3A%27%20george%20bush%20%20%27/page:1/',
+ 'scope:all/sort:activity-desc/page:1/query:%22%40anna%20haha%20%40%22maria%20fernanda%22%20%40%27diego%20maradona%27%20hehe%20%5Buser%3Akarl%20%20marx%5D%20hoho%20%20user%3A%27%20george%20bush%20%20%27/',
ss.query_string()
)