diff options
| author | Leonardo Schäffer <leonardo.schaffer@gmail.com> | 2015-06-25 11:20:44 -0300 |
|---|---|---|
| committer | Leonardo Schäffer <leonardo.schaffer@gmail.com> | 2015-06-25 11:20:44 -0300 |
| commit | 42f31aa607750eb7c00224e7c1c353b27cbd7519 (patch) | |
| tree | 4bbfae731c8427c526f22bacb9136e5ed3e69d8c /service/test/functional | |
| parent | 7f349abe67b8e1a71798478f6c26b08773f2d869 (diff) | |
| parent | 0b179c61043a9854fa23b8fd40fd252864ecd021 (diff) | |
Merge branch 'master' into floatlabel_for_compose
Diffstat (limited to 'service/test/functional')
| -rw-r--r-- | service/test/functional/features/environment.py | 2 | ||||
| -rw-r--r-- | service/test/functional/features/steps/data_setup.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/service/test/functional/features/environment.py b/service/test/functional/features/environment.py index 5dab437f..437529b8 100644 --- a/service/test/functional/features/environment.py +++ b/service/test/functional/features/environment.py @@ -17,7 +17,7 @@ import logging import uuid from test.support.dispatcher.proxy import Proxy -from test.support.integration import AppTestClient, MailBuilder +from test.support.integration import AppTestClient from selenium import webdriver from pixelated.resources.features_resource import FeaturesResource diff --git a/service/test/functional/features/steps/data_setup.py b/service/test/functional/features/steps/data_setup.py index 4e349f05..2a3876fc 100644 --- a/service/test/functional/features/steps/data_setup.py +++ b/service/test/functional/features/steps/data_setup.py @@ -14,6 +14,7 @@ # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see <http://www.gnu.org/licenses/>. from test.support.integration import MailBuilder +from behave import given @given('I have a mail in my inbox') |