Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/lukeaus/django-behave int…
Browse files Browse the repository at this point in the history
…o lukeaus-master
  • Loading branch information
hobthross committed Apr 29, 2018
2 parents d087f8e + a167a0e commit 8b62725
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
6 changes: 3 additions & 3 deletions README.md
@@ -1,4 +1,4 @@
[![Build Status](https://travis-ci.org/django-behave/django-behave.svg?branch=master)](https://travis-ci.org/django-behave/django-behave)
[![Build Status](https://travis-ci.org/django-behave/django-behave.svg?branch=master)](https://travis-ci.org/django-behave/django-behave)
Tested on:
- Python 2.7
- Python 3.3, 3.4
Expand Down Expand Up @@ -94,11 +94,11 @@ with Django's manage.py test options, all options meant for django-behave start
with '--behave_'. For example, given the following Behave command:

behave --no-color --tags @mytag ...

this would become:

./manage.py test --behave_no-color --behave_tags @mytag ...

In addition, the option '--behave_browser' can allow the user to specify which
browser to use for testing. For example:

Expand Down
1 change: 1 addition & 0 deletions django_behave/runner.py
Expand Up @@ -218,6 +218,7 @@ def add_arguments(cls, parser):
# Set up to accept all of Behave's command line options and our own. In
# order to NOT conflict with Django's test command, we'll start all options
# with the prefix "--behave_" (we'll only do the long version of an option).
super(DjangoBehaveTestSuiteRunner, cls).add_arguments(parser)
option_list, cls.option_info = get_options()

for option in option_list:
Expand Down

0 comments on commit 8b62725

Please sign in to comment.