Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/python3 update #63

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
70fe550
Fixed DELETE body request warning
viktoras25 Aug 2, 2013
536675b
Added Should Not Contain function
viktoras25 Aug 8, 2013
4857fd4
Added PATCH as main keyword
jverhoeven Jun 9, 2014
6a89575
GET command takes a string from a string, effectively not allowing to…
jverhoeven Oct 13, 2014
5046879
Added OPTIONS as main keyword
Oct 22, 2014
1dfa297
Merge pull request #2 from ybilik/options_keyword
jverhoeven Jan 12, 2015
708d1bc
replace direct member access with method call
obruns Feb 9, 2015
f4cc5b7
return the response body as a unicode object
obruns Feb 9, 2015
91e4cd9
convert HTTP header keys from unicode objects into str objects
obruns Feb 9, 2015
e766830
http_request passing headers into webtest through keyword argument.
KoleS46 Feb 9, 2016
465553b
Update to robotframework 3.0.0
KoleS46 Feb 9, 2016
a788b50
Travis CI fix.
KoleS46 Feb 9, 2016
f53eaff
Changed extension to .robot for Github formatting.
GLMeece Mar 4, 2016
ade400c
1. Added explicit OPTIONS method
Jun 22, 2016
1ece59e
1. README update
Jun 22, 2016
a246781
1. url rollback
Jun 22, 2016
6d2aafa
1. Added git ignore file
Jun 22, 2016
5b6537c
fixed load_json (#1)
AlahmadiQ8 Jul 20, 2016
6a07e94
1. Fix: Set Json Value keyword.
Jul 20, 2016
dc7dddd
1. Keep orinigan data type returned by 'Get Json Value' keyword
Sep 15, 2016
17096bf
1. Split JSON data and string keywords
Sep 15, 2016
7e4cdd3
1. Added stringify parameter
Sep 15, 2016
41de769
1. json_pointer fix
Sep 15, 2016
337ec7e
1. bumped up RF version
Sep 16, 2016
d196d52
**v0.4.6**
Oct 25, 2016
dc1effc
1. added PATCH method support
vikulin Jun 25, 2018
4bb1f9d
1. bracket fix
vikulin Jun 25, 2018
bfb97a5
Added function remove_json_key
vinaybond Aug 27, 2018
b40a717
Merge pull request #1 from viktoras25/master
jerry57 Dec 12, 2019
14513b1
Merge pull request #2 from jverhoeven/master
jerry57 Dec 12, 2019
3a402e1
Merge pull request #3 from obruns/topic/support-bodies-with-unicode
jerry57 Dec 12, 2019
5a70cfc
Merge pull request #5 from KoleS46/master
jerry57 Dec 12, 2019
e181e39
Merge pull request #6 from GLMeece/patch-1
jerry57 Dec 12, 2019
29eb56e
Merge pull request #8 from vikulin/master
jerry57 Dec 12, 2019
31c3ffd
Merge pull request #11 from vinaybond/patch-1
jerry57 Dec 12, 2019
6e57688
after running 2to3 script
Dec 12, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
1. Added explicit OPTIONS method
  • Loading branch information
Vadym Vikulin committed Jun 22, 2016
commit ade400c75897811b2800d53a9d0a5122296e1977
9 changes: 4 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,18 @@

setup(
name='robotframework-httplibrary',
version="0.4.2",
version="0.4.3",
description='Robot Framework keywords for HTTP requests',
long_description=long_description,
author='Filip Noetzel',
author_email='filip+rfhttplibrary@j03.de',
url='https://github.com/peritus/robotframework-httplibrary',
url='https://github.com/vikulin/robotframework-httplibrary',
license='Beerware',
keywords='robotframework testing testautomation web http webtest',
keywords='robotframework testing test automation web http webtest',
platforms='any',
zip_safe=False,
classifiers=CLASSIFIERS.splitlines(),
package_dir={'': 'src'},
install_requires=['robotframework', 'webtest>=2.0', 'jsonpatch',
'jsonpointer'],
install_requires=['robotframework', 'webtest>=2.0', 'jsonpatch', 'jsonpointer'],
packages=['HttpLibrary']
)
16 changes: 15 additions & 1 deletion src/HttpLibrary/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class HTTP:
Pointer, go to http://tools.ietf.org/html/draft-pbryan-zyp-json-pointer-00.
"""

ROBOT_LIBRARY_VERSION = "0.4.2"
ROBOT_LIBRARY_VERSION = "0.4.3"

class Context(object):
def __init__(self, http, host=None, scheme='http'):
Expand Down Expand Up @@ -281,6 +281,20 @@ def DELETE(self, url):
self.app.delete(path, {}, self.context.request_headers)
)

def OPTIONS(self, url):
"""
Issues a HTTP OPTIONS request.

`url` is the URL relative to the server root, e.g. '/_utils/config.html'
"""
path = self._path_from_url_or_path(url)
self.context.pre_process_request()
logger.debug("Performing OPTIONS request on %s://%s%s" % (
self.context._scheme, self.app.host, path))
self.context.post_process_request(
self.app.options(path, self.context.request_headers)
)

def follow_response(self):
"""
Follows a HTTP redirect if the previous response status code was a 301 or 302.
Expand Down