Commit graph

2892 commits

Author SHA1 Message Date
Kenneth Reitz
31174fecd2 resolve merge conflicts 2017-05-25 17:21:32 -04:00
Kenneth Reitz
90854c756a resolve merge conflicts 2017-05-25 17:15:53 -04:00
David Lord
cb94f4c5d3 Merge pull request #2322 from nnja/dont_overwrite_vary_header
Don't overwrite Vary header when setting for cookie access
2017-05-25 10:46:45 -07:00
David Lord
bdf31cd423
extract patch_vary_header to helpers 2017-05-25 10:26:02 -07:00
David Lord
a4ae7f4d3c Merge pull request #2334 from zebpalmer/master
Docs sidebar missing space
2017-05-25 10:06:53 -07:00
Zeb Palmer
749ef01831 Missing Space
Smallest PR ever, but that missing space has been annoying me for a very long time.
2017-05-25 10:53:43 -06:00
David Lord
c5be20b53c Merge pull request #2332 from doobeh/pycharm-config
PyCharm Run Configuration Guide
2017-05-25 09:52:46 -07:00
David Lord
9f61ed99da Merge pull request #2333 from D4D3VD4V3/patch-1
Fixed typo in docs
2017-05-25 08:24:51 -07:00
Dave
7e14f6706a Fix typo 2017-05-25 10:04:10 +05:30
Nina Zakharenko
e7cd68ba58 Don't overwrite Vary header when setting for cookie access #2317 2017-05-24 20:05:11 -07:00
Anthony Plunkett
f52f3ef31d PyCharm Run Configuration Guide 2017-05-24 18:50:25 -07:00
Christian Stade-Schuldt
4ec1fbc9f5 More DRYing up the test suite (#2325) 2017-05-24 17:27:36 -07:00
Dave Morse
50c6df7098 Minor edits to tutorial for clarity. (#2330) 2017-05-24 17:00:20 -07:00
David Lord
471c7f3220 Merge pull request #2331 from davidism/less-travis
Reduce test envs, add coverage reports, other test fixups
2017-05-24 15:57:56 -07:00
David Lord
65b22926f7
reduce number of tox and travis envs
bump minimum werkzeug version to fix tests
cache pip pacakges on travis
collect branch coverage
collect coverage of test code
report coverage across envs
test building docs
enable codecov integration
2017-05-24 15:41:35 -07:00
David Lord
c62b614d9c Merge pull request #2324 from rzelayafavila/2313-refactor-gevent-tests-into-class
Fix for Issue 2313 - refactoring gevent tests into class
2017-05-23 17:31:44 -07:00
David Lord
849fc4b90c Merge pull request #2323 from dawran6/test-fixture
Cleanup test_blueprint.py to use test fixtures
2017-05-23 17:14:57 -07:00
David Lord
89aaac7fe0 Merge pull request #2321 from dawran6/test-bp-url
Add test for Blueprint app-wide url processing
2017-05-23 17:14:23 -07:00
Rene A. Zelaya
d29dbe14cf Correcting name of GreenletContextCopying test class (to start with 'Test'), making it extend object, and also having the test methods in it include 'self' as first argument. 2017-05-23 16:51:50 -07:00
Rene A. Zelaya
f40617029a Merge remote-tracking branch 'pallets/master' into 2313-refactor-gevent-tests-into-class 2017-05-23 16:45:47 -07:00
Rene A. Zelaya
2eb28165a9 Bundling 'test_greenlet_context_copying' functions into a new class in tests/test_reqctx.py. 2017-05-23 16:45:11 -07:00
Randy Liou
c03a82713a Cleanup test_blueprint.py to use test fixtures
Modify several tests to use the app and client test fixtures.
2017-05-23 16:42:14 -07:00
Randy Liou
3fce4898f8 Add test for Blueprint app-wide url processing
The test add coverage for methods: Blueprint.app_url_defaults, and
Blueprint.app_url_preprocessing. This PR increases the coverage of
blueprint module by 2%.
2017-05-23 16:26:53 -07:00
David Lord
39f7aaa416 Merge pull request #2319 from HndrkMkt/#2266-support-create-app-without-script-info
Support `create_app` without script_info or with script_info as named argument
2017-05-23 16:24:29 -07:00
David Lord
964c5c5aca
add changelog
[ci skip]
2017-05-23 16:24:07 -07:00
David Lord
701faf0724 Merge pull request #2320 from markshannon/fix-click-dependency-info
Update click dependency info.
2017-05-23 16:20:59 -07:00
David Lord
38df3df735
shorten cli factory name
[ci skip]
2017-05-23 16:19:41 -07:00
David Lord
a11212377d
add lowest click version to tox
add devel click version to tox
add devel markupsafe version to tox
2017-05-23 16:08:46 -07:00
David Lord
898c8621b1 Merge pull request #2315 from leviroth/powershell-docs
Added documentation for PowerShell environment variables
2017-05-23 15:33:59 -07:00
Mark Shannon
d05862574f Update click dependency info. 2017-05-23 15:29:37 -07:00
Christian Stade-Schuldt
5b0b9717da DRYing up the test suite using pytest fixtures (#2306)
* add fixtures to conftest.py

* use fixtures in test_appctx.py

* use fixtures in test_blueprints.py

* use fixtures in test_depreciations.py

* use fixtures in test_regressions.py

* use fixtures in test_reqctx.py

* use fixtures in test_templating.py

* use fixtures in test_user_error_handler.py

* use fixtures in test_views.py

* use fixtures in test_basics.py

* use fixtures in test_helpers.py

* use fixtures in test_testing.py

* update conftest.py

* make docstrings  PEP-257 compliant

* cleanup

* switch dictonary format

* use pytest parameterization for test_json_as_unicode
2017-05-23 15:18:39 -07:00
Hendrik Makait
ae41df9a77 Check if app factory takes script_info argument and call it with(out) script_info as an argument depending on that 2017-05-23 13:48:42 -07:00
David Lord
81c2440a05 Merge pull request #2318 from bovarysme/fix-testing-docs
Fix a small oversight in the testing docs
2017-05-23 13:31:56 -07:00
bovarysme
fe27d04cc1 Fix a small oversight in the testing docs 2017-05-23 22:22:16 +02:00
David Lord
ce813ae521 Merge pull request #2316 from ka7eh/automatic-options-in-views
Adds provide_automatic_options to Class-based Views
2017-05-23 12:46:31 -07:00
David Lord
a037762781 Merge pull request #2311 from bovarysme/use-yield-syntax
Use the yield syntax in pytest's fixtures
2017-05-23 12:00:34 -07:00
David Lord
e206764955 Merge pull request #2314 from cerickson/errorhandler
Added support for generic HTTPException handlers on app and blueprints
2017-05-23 11:51:17 -07:00
kaveh
75f537fb87 Adds provide_automatic_options to Class-based Views 2017-05-23 11:51:13 -07:00
David Lord
cd593bf117 Merge pull request #2307 from neilvictorgrey/master
For Issue #2286: Update unittest references
2017-05-23 11:50:31 -07:00
David Lord
8858135043 Update testing.rst 2017-05-23 11:50:14 -07:00
Levi Roth
954d9ca0b8 Added documentation for PowerShell environment variables 2017-05-23 14:30:39 -04:00
David Lord
54a18a5e94 Merge pull request #2305 from sorech02/updating_contributing_rst
Updating contributing rst
2017-05-23 11:19:57 -07:00
David Lord
532ca2e089
reorganize git instructions 2017-05-23 11:18:48 -07:00
cerickson
361dba7e3a removed dupe text from merge 2017-05-23 10:49:01 -07:00
cerickson
48f7b9394c Merge branch 'errorhandler' of https://github.com/cerickson/flask into errorhandler 2017-05-23 10:46:56 -07:00
cerickson
4f815015b8 Added support for generic HTTPException handlers on app and blueprints
Error handlers are now returned in order of blueprint:code, app:code,
blueprint:HTTPException, app:HTTPException, None

Corresponding tests also added.

Ref issue #941, pr #1383, #2082, #2144
2017-05-23 10:45:42 -07:00
cerickson
637eae5489 Added support for generic HTTPException handlers on app and blueprints
Error handlers are now returned in order of blueprint:code, app:code,
blueprint:HTTPException, app:HTTPException, None

Corresponding tests also added.

Ref issue #941, pr #1383, #2082, #2144
2017-05-23 10:37:36 -07:00
Florian Sachs
668061a5fc Register errorhandlers for Exceptions
Allow a default errorhandler by registering
an errorhandler for HTTPException

tests included
2017-05-23 10:34:31 -07:00
bovarysme
5963cb5a51 Use the yield syntax in pytest's fixtures 2017-05-23 18:21:29 +02:00
Christopher Sorenson
2339f1f24e
making some updates to the CONTRIBUTING.rst 2017-05-23 08:56:27 -07:00