From 89d26f3cd389f41b83d27ea225944a0ff8bc2e95 Mon Sep 17 00:00:00 2001 From: Duda Dornelles Date: Wed, 15 Oct 2014 09:42:08 +0200 Subject: Getting rid of singletons and optimizing imports --- service/test/functional/features/environment.py | 5 +++-- service/test/functional/features/steps/compose.py | 6 ++---- service/test/functional/features/steps/data_setup.py | 1 - service/test/functional/features/steps/mail_list.py | 2 -- service/test/functional/features/steps/mail_view.py | 3 --- service/test/functional/features/steps/search.py | 4 ++-- service/test/functional/features/steps/tag_list.py | 4 ---- 7 files changed, 7 insertions(+), 18 deletions(-) (limited to 'service/test/functional') diff --git a/service/test/functional/features/environment.py b/service/test/functional/features/environment.py index db4aea9b..f65b11a6 100644 --- a/service/test/functional/features/environment.py +++ b/service/test/functional/features/environment.py @@ -13,11 +13,12 @@ # # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see . +import time +import multiprocessing + from selenium import webdriver from test.support.integration_helper import SoledadTestBase -import time import pixelated.user_agent -import multiprocessing def before_all(context): diff --git a/service/test/functional/features/steps/compose.py b/service/test/functional/features/steps/compose.py index 5e323866..8bf88598 100644 --- a/service/test/functional/features/steps/compose.py +++ b/service/test/functional/features/steps/compose.py @@ -13,11 +13,9 @@ # # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see . -from behave import given, when -from selenium.webdriver.common.by import By -from selenium.webdriver.support import expected_conditions as EC -from selenium.webdriver.support.wait import WebDriverWait from time import sleep + +from behave import given, when from common import * from hamcrest import * diff --git a/service/test/functional/features/steps/data_setup.py b/service/test/functional/features/steps/data_setup.py index 4f70a8db..51c5f9b8 100644 --- a/service/test/functional/features/steps/data_setup.py +++ b/service/test/functional/features/steps/data_setup.py @@ -13,7 +13,6 @@ # # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see . -from behave import * from test.support.integration_helper import MailBuilder diff --git a/service/test/functional/features/steps/mail_list.py b/service/test/functional/features/steps/mail_list.py index c642b4bd..a1c83848 100644 --- a/service/test/functional/features/steps/mail_list.py +++ b/service/test/functional/features/steps/mail_list.py @@ -13,8 +13,6 @@ # # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see . -import re -from behave import * from common import * diff --git a/service/test/functional/features/steps/mail_view.py b/service/test/functional/features/steps/mail_view.py index 2b0f1abb..a127b62c 100644 --- a/service/test/functional/features/steps/mail_view.py +++ b/service/test/functional/features/steps/mail_view.py @@ -13,12 +13,9 @@ # # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see . -import re from selenium.webdriver.common.keys import Keys -from behave import * from common import * from hamcrest import * -from time import sleep @then('I see that the subject reads \'{subject}\'') diff --git a/service/test/functional/features/steps/search.py b/service/test/functional/features/steps/search.py index cf97eb74..8c410112 100644 --- a/service/test/functional/features/steps/search.py +++ b/service/test/functional/features/steps/search.py @@ -13,11 +13,11 @@ # # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see . +from time import sleep + from selenium.webdriver.common.keys import Keys -from behave import * from common import * from hamcrest import * -from time import sleep @when('I search for a mail with the words "{search_term}"') diff --git a/service/test/functional/features/steps/tag_list.py b/service/test/functional/features/steps/tag_list.py index b6f654f0..9a6aceb9 100644 --- a/service/test/functional/features/steps/tag_list.py +++ b/service/test/functional/features/steps/tag_list.py @@ -13,10 +13,6 @@ # # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see . -from behave import * -from selenium.webdriver.common.by import By -from selenium.webdriver.support import expected_conditions as EC -from selenium.webdriver.support.wait import WebDriverWait from common import * -- cgit v1.2.3