Merge branch '383-status-should-be-uses-last-request-even-if-a-respon…

…se-is-provided'
MarketSquare · Nov 14, 2023 · 533c31c · 533c31c
2 parents ff2d0a2 + bd42530
commit 533c31c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
-        python-version: [ 2.7, 3.7, 3.8, 3.x ]
+        python-version: [ 3.7, 3.8, 3.x ]
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python

diff --git a/atests/issues/334.robot b/atests/issues/334.robot
@@ -0,0 +1,13 @@
+*** Settings ***
+Library    RequestsLibrary
+Resource  ../res_setup.robot
+
+Suite Setup     Setup Flask Http Server
+Suite Teardown  Teardown Flask Http Server And Sessions
+
+*** Test Cases ***
+
+Test evaluated response is always the one passed
+    ${response_error}=  GET On Session  ${GLOBAL_SESSION}  url=/status/404    expected_status=any
+    ${response_ok}=     GET On Session  ${GLOBAL_SESSION}  url=/status/200    expected_status=any
+    Status Should Be    404    ${response_error}
diff --git a/src/RequestsLibrary/RequestsKeywords.py b/src/RequestsLibrary/RequestsKeywords.py
@@ -116,7 +116,7 @@ def status_should_be(self, expected_status, response=None, msg=None):
         |       ELSE
         |        [...]
         """
-        if not response:
+        if response is None:
             response = self.last_response
         self._check_status(expected_status, response, msg)
 

diff --git a/src/RequestsLibrary/version.py b/src/RequestsLibrary/version.py
@@ -1 +1 @@
-VERSION = '1.0a7'
+VERSION = '1.0a8'