From 1382dbc9cd259a5a8e8001e1295232d6819fb01f Mon Sep 17 00:00:00 2001 From: Amit Anil Malbari Date: Sat, 11 Mar 2023 23:52:13 +0530 Subject: [PATCH 01/12] first commit --- Tests/test_amit.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Tests/test_amit.py diff --git a/Tests/test_amit.py b/Tests/test_amit.py new file mode 100644 index 0000000..e69de29 From d364b4f4a99e2abaebf8d2a194e37b3cef2e49b6 Mon Sep 17 00:00:00 2001 From: SuneethRavi Date: Sat, 11 Mar 2023 13:46:24 -0500 Subject: [PATCH 02/12] sumit test.py --- Tests/test_sumit.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Tests/test_sumit.py diff --git a/Tests/test_sumit.py b/Tests/test_sumit.py new file mode 100644 index 0000000..e69de29 From 4d80e99f7fc2ab7671431e1130cc23be56d35806 Mon Sep 17 00:00:00 2001 From: malbarisumit Date: Sat, 11 Mar 2023 14:53:35 -0500 Subject: [PATCH 03/12] sumit_1 --- Tests/test_sumit_1.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Tests/test_sumit_1.py diff --git a/Tests/test_sumit_1.py b/Tests/test_sumit_1.py new file mode 100644 index 0000000..e69de29 From 484daa79ec27b8fea2dd6e20a98550f313d9a5c4 Mon Sep 17 00:00:00 2001 From: Amit Anil Malbari Date: Sun, 12 Mar 2023 01:23:43 +0530 Subject: [PATCH 04/12] pushing test_amit_1 --- Tests/test_amit_1.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Tests/test_amit_1.py diff --git a/Tests/test_amit_1.py b/Tests/test_amit_1.py new file mode 100644 index 0000000..e69de29 From 2c4a00899879cebeec9d2750445718a97a8b2967 Mon Sep 17 00:00:00 2001 From: malbarisumit Date: Sat, 11 Mar 2023 15:23:43 -0500 Subject: [PATCH 05/12] new changes by sumit --- Tests/test_registration.py | 1 + Tests/test_sumit_1.py | 1 + Tests/test_users.py | 1 + 3 files changed, 3 insertions(+) diff --git a/Tests/test_registration.py b/Tests/test_registration.py index d7218a9..66f7c9f 100644 --- a/Tests/test_registration.py +++ b/Tests/test_registration.py @@ -6,6 +6,7 @@ baseUrl = "https://reqres.in/" def test_successful_registration() : + surname="malbari" path = "api/register" response = requests.post(url=baseUrl+path,json=json.loads('{"email": "eve.holt@reqres.in","password": "'+randomDigits(5)+'"}')) responseJson = json.loads(response.text) diff --git a/Tests/test_sumit_1.py b/Tests/test_sumit_1.py index e69de29..93f42ee 100644 --- a/Tests/test_sumit_1.py +++ b/Tests/test_sumit_1.py @@ -0,0 +1 @@ +sumit is great \ No newline at end of file diff --git a/Tests/test_users.py b/Tests/test_users.py index b238fc8..9b7b5e3 100644 --- a/Tests/test_users.py +++ b/Tests/test_users.py @@ -5,6 +5,7 @@ baseUrl = "https://reqres.in/" def test_fetch_user() : + name="sumit" path = "api/users/2" response = requests.get(url=baseUrl+path) responseJson = json.loads(response.text) From ab9261266587908e1cf644249f787b29d60b2b1b Mon Sep 17 00:00:00 2001 From: Amit Anil Malbari Date: Sun, 12 Mar 2023 01:56:00 +0530 Subject: [PATCH 06/12] amit new changes --- Tests/test_amit_1.py | 1 + Tests/test_registration.py | 1 + Tests/test_users.py | 1 + 3 files changed, 3 insertions(+) diff --git a/Tests/test_amit_1.py b/Tests/test_amit_1.py index e69de29..e5292e0 100644 --- a/Tests/test_amit_1.py +++ b/Tests/test_amit_1.py @@ -0,0 +1 @@ +amit is goat \ No newline at end of file diff --git a/Tests/test_registration.py b/Tests/test_registration.py index d7218a9..390b557 100644 --- a/Tests/test_registration.py +++ b/Tests/test_registration.py @@ -14,6 +14,7 @@ def test_successful_registration() : def test_unsuccessful_registration() : + middlename="anil" path = "api/register" response = requests.post(url=baseUrl+path,json=json.loads('{"email": "testemail@pytest.com"}')) responseJson = json.loads(response.text) diff --git a/Tests/test_users.py b/Tests/test_users.py index b238fc8..1f2957c 100644 --- a/Tests/test_users.py +++ b/Tests/test_users.py @@ -5,6 +5,7 @@ baseUrl = "https://reqres.in/" def test_fetch_user() : + name="amit" path = "api/users/2" response = requests.get(url=baseUrl+path) responseJson = json.loads(response.text) From 4627d3ebf4ca920405fa83c0396583758bfe2f86 Mon Sep 17 00:00:00 2001 From: Amit Anil Malbari Date: Sun, 12 Mar 2023 02:22:04 +0530 Subject: [PATCH 07/12] commit chnages for conflict --- Tests/test_amit.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Tests/test_amit.py b/Tests/test_amit.py index e69de29..02af373 100644 --- a/Tests/test_amit.py +++ b/Tests/test_amit.py @@ -0,0 +1 @@ +amit is G.O.A.T \ No newline at end of file From 44bd9561cda5714fba508f114cc480f3a769b48d Mon Sep 17 00:00:00 2001 From: malbarisumit Date: Sat, 11 Mar 2023 15:59:19 -0500 Subject: [PATCH 08/12] The real G.O.A.T --- Tests/test_amit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/test_amit.py b/Tests/test_amit.py index 02af373..ec1ea20 100644 --- a/Tests/test_amit.py +++ b/Tests/test_amit.py @@ -1 +1 @@ -amit is G.O.A.T \ No newline at end of file +Sumit is G.O.A.T \ No newline at end of file From 1937800b5b1b75f3e7555acef1dd2f22a2dba269 Mon Sep 17 00:00:00 2001 From: malbarisumit Date: Sat, 11 Mar 2023 16:29:05 -0500 Subject: [PATCH 09/12] new --- Tests/test_amit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/test_amit.py b/Tests/test_amit.py index ec1ea20..5546617 100644 --- a/Tests/test_amit.py +++ b/Tests/test_amit.py @@ -1 +1 @@ -Sumit is G.O.A.T \ No newline at end of file +Sumit is G.O.A.T...... From 64f1af3e656f55b107058b26a73356df16f45911 Mon Sep 17 00:00:00 2001 From: malbarisumit Date: Sun, 12 Mar 2023 03:27:57 -0400 Subject: [PATCH 10/12] first --- Tests/test_amit.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Tests/test_amit.py b/Tests/test_amit.py index 5546617..294315b 100644 --- a/Tests/test_amit.py +++ b/Tests/test_amit.py @@ -1 +1,2 @@ Sumit is G.O.A.T...... +first commit \ No newline at end of file From 6a1bcabfe8188605ab85b1be33920f2cc679718c Mon Sep 17 00:00:00 2001 From: malbarisumit Date: Sun, 12 Mar 2023 03:28:49 -0400 Subject: [PATCH 11/12] 2nd commit --- Tests/test_amit.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Tests/test_amit.py b/Tests/test_amit.py index 294315b..2797968 100644 --- a/Tests/test_amit.py +++ b/Tests/test_amit.py @@ -1,2 +1,3 @@ Sumit is G.O.A.T...... -first commit \ No newline at end of file +first commit +2nd commit \ No newline at end of file From 8efab66bf720759672b0ad197d2c29f8232b281d Mon Sep 17 00:00:00 2001 From: malbarisumit Date: Sun, 12 Mar 2023 03:29:48 -0400 Subject: [PATCH 12/12] 3rd commit --- Tests/test_amit.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Tests/test_amit.py b/Tests/test_amit.py index 2797968..136169a 100644 --- a/Tests/test_amit.py +++ b/Tests/test_amit.py @@ -1,3 +1,4 @@ Sumit is G.O.A.T...... first commit -2nd commit \ No newline at end of file +2nd commit +3rd commit \ No newline at end of file