From 764a891901a8a9928b725b20763affe69d7f2383 Mon Sep 17 00:00:00 2001 From: Oleg Pidsadnyi Date: Sun, 10 Nov 2013 13:00:03 +0100 Subject: [PATCH] fixes the requirements --- features/auth/login.feature | 6 +++--- tests/functional/conftest.py | 6 +++--- tests/functional/test_auth.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/features/auth/login.feature b/features/auth/login.feature index 4b4ba78..dee5134 100644 --- a/features/auth/login.feature +++ b/features/auth/login.feature @@ -24,9 +24,9 @@ Scenario: Invalid password Given I'm not logged in When I go to login page - And I enter "wrong" username - And I enter "default" password + And I enter "admin" username + And I enter "wrong" password And I click login button - Then I should see "Error: Invalid username" + Then I should see "Error: Invalid password" diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py index 0cd24d9..1d4649c 100644 --- a/tests/functional/conftest.py +++ b/tests/functional/conftest.py @@ -6,9 +6,9 @@ from .fixtures.auth import * from .fixtures.steps import * -# @pytest.fixture(scope='session') -# def pytestbdd_selenium_speed(): -# return 0.5 +@pytest.fixture(scope='session') +def pytestbdd_selenium_speed(): + return 0.5 @pytest.fixture diff --git a/tests/functional/test_auth.py b/tests/functional/test_auth.py index 59af01f..5c297b7 100644 --- a/tests/functional/test_auth.py +++ b/tests/functional/test_auth.py @@ -1,7 +1,7 @@ import re from urlparse import urljoin -from pytest_bdd import given, when, scenario +from pytest_bdd import when, scenario test_sucsessful_login = scenario(