Import JWT_TOKEN from fixtures at test_token, and replace {} with at …

…asserts
WorkShoft · Jul 19, 2020 · b70680d · b70680d
1 parent 8b6133a
commit b70680d
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 43 deletions.
diff --git a/api/tests/test_token.py b/api/tests/test_token.py
@@ -5,14 +5,9 @@
 
 from unittest.mock import MagicMock
 
-from fixtures import users
+from fixtures import users, JWT_TOKEN
 
 
-JWT_TOKEN = {
-    "refresh": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ0b2tlbl90eXBlIjoicmVmcmVzaCIsImV4cCI6MTU5NTIzMjMxMCwianRpIjoiMTViM2ZiZGNhODJlNDBiMDkyNTBiYzA5ZTlkODQwMmYiLCJ1c2VyX2lkIjoxfQ.3UZIhcS4X14zb9V7wRnf0G3TJ1f7G6UMijThokvOD_M",
-    "access": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ0b2tlbl90eXBlIjoiYWNjZXNzIiwiZXhwIjoxNTk1MTQ1OTIyLCJqdGkiOiI1ODBjNmM3ZDcyNTk0NmJmOWJiNGY1YmMyMzcyMjY0MiIsInVzZXJfaWQiOjF9.44RKjIbKXmWqjzJA0TtpbnBTt3-3tAMxUP1EZDMJais",
-}
-
 TokenObtainPairSerializer.validate = MagicMock(return_value=JWT_TOKEN)
 
 
@@ -25,7 +20,7 @@ def test_custom_jwt_token(users):
 
     data = custom_token_serializer.validate("foo")
 
-    assert data.get("refresh", {}) == JWT_TOKEN["refresh"]
-    assert data.get("access", {}) == JWT_TOKEN["access"]
-    assert data.get("name", {}) == user_one.username
-    assert data.get("active", {}) == user_one.active
+    assert data.get("refresh", "") == JWT_TOKEN["refresh"]
+    assert data.get("access", "") == JWT_TOKEN["access"]
+    assert data.get("name", "") == user_one.username
+    assert data.get("active", "") == user_one.active
diff --git a/docs/api_coverage/api_services_py.html b/docs/api_coverage/api_services_py.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=emulateIE7" />
-    <title>Coverage for api/services.py: 93%</title>
+    <title>Coverage for api/services.py: 99%</title>
     <link rel="stylesheet" href="style.css" type="text/css">
     <script type="text/javascript" src="jquery.min.js"></script>
     <script type="text/javascript" src="jquery.hotkeys.js"></script>
@@ -17,13 +17,13 @@
 <div id="header">
     <div class="content">
         <h1>Coverage for <b>api/services.py</b> :
-            <span class="pc_cov">93%</span>
+            <span class="pc_cov">99%</span>
         </h1>
         <img id="keyboard_icon" src="keybd_closed.png" alt="Show keyboard shortcuts" />
         <h2 class="stats">
             113 statements &nbsp;
-            <span class="run shortkey_r button_toggle_run">105 run</span>
-            <span class="mis show_mis shortkey_m button_toggle_mis">8 missing</span>
+            <span class="run shortkey_r button_toggle_run">112 run</span>
+            <span class="mis show_mis shortkey_m button_toggle_mis">1 missing</span>
             <span class="exc show_exc shortkey_x button_toggle_exc">0 excluded</span>
         </h2>
     </div>
@@ -284,15 +284,15 @@ <h2 class="stats">
     <p id="t231" class="run"><span class="n"><a href="#t231">231</a></span><span class="t">    <span class="nam">result</span> <span class="op">=</span> <span class="nam">game_instance</span><span class="op">.</span><span class="nam">result</span><span class="op">.</span><span class="nam">result</span>&nbsp;</span><span class="r"></span></p>
     <p id="t232" class="pln"><span class="n"><a href="#t232">232</a></span><span class="t">&nbsp;</span><span class="r"></span></p>
     <p id="t233" class="run"><span class="n"><a href="#t233">233</a></span><span class="t">    <span class="key">if</span> <span class="nam">result</span> <span class="op">==</span> <span class="nam">Result</span><span class="op">.</span><span class="nam">DRAW</span><span class="op">:</span>&nbsp;</span><span class="r"></span></p>
-    <p id="t234" class="mis show_mis"><span class="n"><a href="#t234">234</a></span><span class="t">        <span class="nam">scores</span><span class="op">[</span><span class="str">"white"</span><span class="op">]</span> <span class="op">+=</span> <span class="num">0.5</span>&nbsp;</span><span class="r"></span></p>
-    <p id="t235" class="mis show_mis"><span class="n"><a href="#t235">235</a></span><span class="t">        <span class="nam">scores</span><span class="op">[</span><span class="str">"black"</span><span class="op">]</span> <span class="op">+=</span> <span class="num">0.5</span>&nbsp;</span><span class="r"></span></p>
-    <p id="t236" class="mis show_mis"><span class="n"><a href="#t236">236</a></span><span class="t">        <span class="nam">white</span><span class="op">.</span><span class="nam">elo</span><span class="op">.</span><span class="nam">draws</span> <span class="op">+=</span> <span class="num">1</span>&nbsp;</span><span class="r"></span></p>
-    <p id="t237" class="mis show_mis"><span class="n"><a href="#t237">237</a></span><span class="t">        <span class="nam">black</span><span class="op">.</span><span class="nam">elo</span><span class="op">.</span><span class="nam">draws</span> <span class="op">+=</span> <span class="num">1</span>&nbsp;</span><span class="r"></span></p>
+    <p id="t234" class="run"><span class="n"><a href="#t234">234</a></span><span class="t">        <span class="nam">scores</span><span class="op">[</span><span class="str">"white"</span><span class="op">]</span> <span class="op">+=</span> <span class="num">0.5</span>&nbsp;</span><span class="r"></span></p>
+    <p id="t235" class="run"><span class="n"><a href="#t235">235</a></span><span class="t">        <span class="nam">scores</span><span class="op">[</span><span class="str">"black"</span><span class="op">]</span> <span class="op">+=</span> <span class="num">0.5</span>&nbsp;</span><span class="r"></span></p>
+    <p id="t236" class="run"><span class="n"><a href="#t236">236</a></span><span class="t">        <span class="nam">white</span><span class="op">.</span><span class="nam">elo</span><span class="op">.</span><span class="nam">draws</span> <span class="op">+=</span> <span class="num">1</span>&nbsp;</span><span class="r"></span></p>
+    <p id="t237" class="run"><span class="n"><a href="#t237">237</a></span><span class="t">        <span class="nam">black</span><span class="op">.</span><span class="nam">elo</span><span class="op">.</span><span class="nam">draws</span> <span class="op">+=</span> <span class="num">1</span>&nbsp;</span><span class="r"></span></p>
     <p id="t238" class="pln"><span class="n"><a href="#t238">238</a></span><span class="t">&nbsp;</span><span class="r"></span></p>
     <p id="t239" class="run"><span class="n"><a href="#t239">239</a></span><span class="t">    <span class="key">elif</span> <span class="nam">result</span> <span class="op">==</span> <span class="nam">Result</span><span class="op">.</span><span class="nam">WHITE_WINS</span><span class="op">:</span>&nbsp;</span><span class="r"></span></p>
-    <p id="t240" class="mis show_mis"><span class="n"><a href="#t240">240</a></span><span class="t">        <span class="nam">scores</span><span class="op">[</span><span class="str">"white"</span><span class="op">]</span> <span class="op">+=</span> <span class="num">1</span>&nbsp;</span><span class="r"></span></p>
-    <p id="t241" class="mis show_mis"><span class="n"><a href="#t241">241</a></span><span class="t">        <span class="nam">white</span><span class="op">.</span><span class="nam">elo</span><span class="op">.</span><span class="nam">wins</span> <span class="op">+=</span> <span class="num">1</span>&nbsp;</span><span class="r"></span></p>
-    <p id="t242" class="mis show_mis"><span class="n"><a href="#t242">242</a></span><span class="t">        <span class="nam">black</span><span class="op">.</span><span class="nam">elo</span><span class="op">.</span><span class="nam">losses</span> <span class="op">+=</span> <span class="num">1</span>&nbsp;</span><span class="r"></span></p>
+    <p id="t240" class="run"><span class="n"><a href="#t240">240</a></span><span class="t">        <span class="nam">scores</span><span class="op">[</span><span class="str">"white"</span><span class="op">]</span> <span class="op">+=</span> <span class="num">1</span>&nbsp;</span><span class="r"></span></p>
+    <p id="t241" class="run"><span class="n"><a href="#t241">241</a></span><span class="t">        <span class="nam">white</span><span class="op">.</span><span class="nam">elo</span><span class="op">.</span><span class="nam">wins</span> <span class="op">+=</span> <span class="num">1</span>&nbsp;</span><span class="r"></span></p>
+    <p id="t242" class="run"><span class="n"><a href="#t242">242</a></span><span class="t">        <span class="nam">black</span><span class="op">.</span><span class="nam">elo</span><span class="op">.</span><span class="nam">losses</span> <span class="op">+=</span> <span class="num">1</span>&nbsp;</span><span class="r"></span></p>
     <p id="t243" class="pln"><span class="n"><a href="#t243">243</a></span><span class="t">&nbsp;</span><span class="r"></span></p>
     <p id="t244" class="run"><span class="n"><a href="#t244">244</a></span><span class="t">    <span class="key">elif</span> <span class="nam">result</span> <span class="op">==</span> <span class="nam">Result</span><span class="op">.</span><span class="nam">BLACK_WINS</span><span class="op">:</span>&nbsp;</span><span class="r"></span></p>
     <p id="t245" class="run"><span class="n"><a href="#t245">245</a></span><span class="t">        <span class="nam">scores</span><span class="op">[</span><span class="str">"black"</span><span class="op">]</span> <span class="op">+=</span> <span class="num">1</span>&nbsp;</span><span class="r"></span></p>
@@ -314,7 +314,7 @@ <h2 class="stats">
     <div class="content">
         <p>
             <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io">coverage.py v5.1</a>,
-            created at 2020-07-19 11:02
+            created at 2020-07-19 11:38
         </p>
     </div>
 </div>

diff --git a/docs/api_coverage/api_urls_py.html b/docs/api_coverage/api_urls_py.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=emulateIE7" />
-    <title>Coverage for api/urls.py: 0%</title>
+    <title>Coverage for api/urls.py: 100%</title>
     <link rel="stylesheet" href="style.css" type="text/css">
     <script type="text/javascript" src="jquery.min.js"></script>
     <script type="text/javascript" src="jquery.hotkeys.js"></script>
@@ -17,13 +17,13 @@
 <div id="header">
     <div class="content">
         <h1>Coverage for <b>api/urls.py</b> :
-            <span class="pc_cov">0%</span>
+            <span class="pc_cov">100%</span>
         </h1>
         <img id="keyboard_icon" src="keybd_closed.png" alt="Show keyboard shortcuts" />
         <h2 class="stats">
             7 statements &nbsp;
-            <span class="run shortkey_r button_toggle_run">0 run</span>
-            <span class="mis show_mis shortkey_m button_toggle_mis">7 missing</span>
+            <span class="run shortkey_r button_toggle_run">7 run</span>
+            <span class="mis show_mis shortkey_m button_toggle_mis">0 missing</span>
             <span class="exc show_exc shortkey_x button_toggle_exc">0 excluded</span>
         </h2>
     </div>
@@ -52,25 +52,25 @@ <h2 class="stats">
 </div>
 <div id="source">
     <p id="t1" class="pln"><span class="n"><a href="#t1">1</a></span><span class="t"><span class="com"># posts/urls.py</span>&nbsp;</span><span class="r"></span></p>
-    <p id="t2" class="mis show_mis"><span class="n"><a href="#t2">2</a></span><span class="t"><span class="key">from</span> <span class="nam">django</span><span class="op">.</span><span class="nam">urls</span> <span class="key">import</span> <span class="nam">include</span><span class="op">,</span> <span class="nam">path</span>&nbsp;</span><span class="r"></span></p>
-    <p id="t3" class="mis show_mis"><span class="n"><a href="#t3">3</a></span><span class="t"><span class="key">from</span> <span class="nam">rest_framework</span><span class="op">.</span><span class="nam">routers</span> <span class="key">import</span> <span class="nam">DefaultRouter</span>&nbsp;</span><span class="r"></span></p>
+    <p id="t2" class="run"><span class="n"><a href="#t2">2</a></span><span class="t"><span class="key">from</span> <span class="nam">django</span><span class="op">.</span><span class="nam">urls</span> <span class="key">import</span> <span class="nam">include</span><span class="op">,</span> <span class="nam">path</span>&nbsp;</span><span class="r"></span></p>
+    <p id="t3" class="run"><span class="n"><a href="#t3">3</a></span><span class="t"><span class="key">from</span> <span class="nam">rest_framework</span><span class="op">.</span><span class="nam">routers</span> <span class="key">import</span> <span class="nam">DefaultRouter</span>&nbsp;</span><span class="r"></span></p>
     <p id="t4" class="pln"><span class="n"><a href="#t4">4</a></span><span class="t">&nbsp;</span><span class="r"></span></p>
-    <p id="t5" class="mis show_mis"><span class="n"><a href="#t5">5</a></span><span class="t"><span class="key">from</span> <span class="op">.</span><span class="nam">views</span> <span class="key">import</span> <span class="nam">EloViewSet</span><span class="op">,</span> <span class="nam">GameViewSet</span>&nbsp;</span><span class="r"></span></p>
+    <p id="t5" class="run"><span class="n"><a href="#t5">5</a></span><span class="t"><span class="key">from</span> <span class="op">.</span><span class="nam">views</span> <span class="key">import</span> <span class="nam">EloViewSet</span><span class="op">,</span> <span class="nam">GameViewSet</span>&nbsp;</span><span class="r"></span></p>
     <p id="t6" class="pln"><span class="n"><a href="#t6">6</a></span><span class="t">&nbsp;</span><span class="r"></span></p>
-    <p id="t7" class="mis show_mis"><span class="n"><a href="#t7">7</a></span><span class="t"><span class="nam">router</span> <span class="op">=</span> <span class="nam">DefaultRouter</span><span class="op">(</span><span class="op">)</span>&nbsp;</span><span class="r"></span></p>
-    <p id="t8" class="mis show_mis"><span class="n"><a href="#t8">8</a></span><span class="t"><span class="nam">router</span><span class="op">.</span><span class="nam">register</span><span class="op">(</span><span class="str">r"game"</span><span class="op">,</span> <span class="nam">GameViewSet</span><span class="op">)</span>&nbsp;</span><span class="r"></span></p>
-    <p id="t9" class="mis show_mis"><span class="n"><a href="#t9">9</a></span><span class="t"><span class="nam">router</span><span class="op">.</span><span class="nam">register</span><span class="op">(</span><span class="str">r"elo"</span><span class="op">,</span> <span class="nam">EloViewSet</span><span class="op">)</span>&nbsp;</span><span class="r"></span></p>
+    <p id="t7" class="run"><span class="n"><a href="#t7">7</a></span><span class="t"><span class="nam">router</span> <span class="op">=</span> <span class="nam">DefaultRouter</span><span class="op">(</span><span class="op">)</span>&nbsp;</span><span class="r"></span></p>
+    <p id="t8" class="run"><span class="n"><a href="#t8">8</a></span><span class="t"><span class="nam">router</span><span class="op">.</span><span class="nam">register</span><span class="op">(</span><span class="str">r"game"</span><span class="op">,</span> <span class="nam">GameViewSet</span><span class="op">)</span>&nbsp;</span><span class="r"></span></p>
+    <p id="t9" class="run"><span class="n"><a href="#t9">9</a></span><span class="t"><span class="nam">router</span><span class="op">.</span><span class="nam">register</span><span class="op">(</span><span class="str">r"elo"</span><span class="op">,</span> <span class="nam">EloViewSet</span><span class="op">)</span>&nbsp;</span><span class="r"></span></p>
     <p id="t10" class="pln"><span class="n"><a href="#t10">10</a></span><span class="t">&nbsp;</span><span class="r"></span></p>
     <p id="t11" class="pln"><span class="n"><a href="#t11">11</a></span><span class="t">&nbsp;</span><span class="r"></span></p>
-    <p id="t12" class="mis show_mis"><span class="n"><a href="#t12">12</a></span><span class="t"><span class="nam">urlpatterns</span> <span class="op">=</span> <span class="op">[</span>&nbsp;</span><span class="r"></span></p>
+    <p id="t12" class="run"><span class="n"><a href="#t12">12</a></span><span class="t"><span class="nam">urlpatterns</span> <span class="op">=</span> <span class="op">[</span>&nbsp;</span><span class="r"></span></p>
     <p id="t13" class="pln"><span class="n"><a href="#t13">13</a></span><span class="t">    <span class="nam">path</span><span class="op">(</span><span class="str">""</span><span class="op">,</span> <span class="nam">include</span><span class="op">(</span><span class="nam">router</span><span class="op">.</span><span class="nam">urls</span><span class="op">)</span><span class="op">)</span><span class="op">,</span>&nbsp;</span><span class="r"></span></p>
     <p id="t14" class="pln"><span class="n"><a href="#t14">14</a></span><span class="t"><span class="op">]</span>&nbsp;</span><span class="r"></span></p>
 </div>
 <div id="footer">
     <div class="content">
         <p>
             <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io">coverage.py v5.1</a>,
-            created at 2020-07-19 11:02
+            created at 2020-07-19 11:39
         </p>
     </div>
 </div>

diff --git a/docs/api_coverage/index.html b/docs/api_coverage/index.html
@@ -17,7 +17,7 @@
 <div id="header">
     <div class="content">
         <h1>Coverage report:
-            <span class="pc_cov">93%</span>
+            <span class="pc_cov">97%</span>
         </h1>
         <img id="keyboard_icon" src="keybd_closed.png" alt="Show keyboard shortcuts" />
         <form id="filter_container">
@@ -53,9 +53,9 @@ <h1>Coverage report:
             <tr class="total">
                 <td class="name left">Total</td>
                 <td>383</td>
-                <td>26</td>
+                <td>12</td>
                 <td>0</td>
-                <td class="right" data-ratio="357 383">93%</td>
+                <td class="right" data-ratio="371 383">97%</td>
             </tr>
         </tfoot>
         <tbody>
@@ -111,16 +111,16 @@ <h1>Coverage report:
             <tr class="file">
                 <td class="name left"><a href="api_services_py.html">api/services.py</a></td>
                 <td>113</td>
-                <td>8</td>
+                <td>1</td>
                 <td>0</td>
-                <td class="right" data-ratio="105 113">93%</td>
+                <td class="right" data-ratio="112 113">99%</td>
             </tr>
             <tr class="file">
                 <td class="name left"><a href="api_urls_py.html">api/urls.py</a></td>
                 <td>7</td>
-                <td>7</td>
                 <td>0</td>
-                <td class="right" data-ratio="0 7">0%</td>
+                <td>0</td>
+                <td class="right" data-ratio="7 7">100%</td>
             </tr>
             <tr class="file">
                 <td class="name left"><a href="api_views_py.html">api/views.py</a></td>
@@ -139,7 +139,7 @@ <h1>Coverage report:
     <div class="content">
         <p>
             <a class="nav" href="https://coverage.readthedocs.io">coverage.py v5.1</a>,
-            created at 2020-07-19 11:04
+            created at 2020-07-19 11:39
         </p>
     </div>
 </div>