Modify to folder structure, add mozwebqa.cfg file

mozilla · Apr 30, 2012 · 75b3f5c · 75b3f5c
1 parent f490e78
commit 75b3f5c
Show file tree

Hide file tree

Showing 31 changed files with 36 additions and 33 deletions.
diff --git a/conftest.py b/conftest.py
@@ -7,7 +7,7 @@
 def pytest_funcarg__mozwebqa_logged_in(request):
     mozwebqa = request.getfuncargvalue('mozwebqa')
 
-    from login_page import MozTrapLoginPage
+    from pages.login_page import MozTrapLoginPage
     login_pg = MozTrapLoginPage(mozwebqa)
     login_pg.go_to_login_page()
     login_pg.login()

diff --git a/mozwebqa.cfg b/mozwebqa.cfg
@@ -0,0 +1,3 @@
+[DEFAULT]
+baseurl = http://caseconductor-dev.allizom.org
+tags = moztrap-tests
diff --git a/pages/__init__.py b/pages/__init__.py
diff --git a/base_page.py → pages/base_page.py b/base_page.py → pages/base_page.py
diff --git a/base_test.py → pages/base_test.py b/base_test.py → pages/base_test.py
diff --git a/create_case_page.py → pages/create_case_page.py b/create_case_page.py → pages/create_case_page.py
diff --git a/create_product_page.py → pages/create_product_page.py b/create_product_page.py → pages/create_product_page.py
diff --git a/create_profile_page.py → pages/create_profile_page.py b/create_profile_page.py → pages/create_profile_page.py
diff --git a/create_run_page.py → pages/create_run_page.py b/create_run_page.py → pages/create_run_page.py
diff --git a/create_suite_page.py → pages/create_suite_page.py b/create_suite_page.py → pages/create_suite_page.py
diff --git a/create_version_page.py → pages/create_version_page.py b/create_version_page.py → pages/create_version_page.py
diff --git a/home_page.py → pages/home_page.py b/home_page.py → pages/home_page.py
diff --git a/login_page.py → pages/login_page.py b/login_page.py → pages/login_page.py
diff --git a/manage_cases_page.py → pages/manage_cases_page.py b/manage_cases_page.py → pages/manage_cases_page.py
diff --git a/manage_products_page.py → pages/manage_products_page.py b/manage_products_page.py → pages/manage_products_page.py
diff --git a/manage_profiles_page.py → pages/manage_profiles_page.py b/manage_profiles_page.py → pages/manage_profiles_page.py
diff --git a/manage_runs_page.py → pages/manage_runs_page.py b/manage_runs_page.py → pages/manage_runs_page.py
diff --git a/manage_suites_page.py → pages/manage_suites_page.py b/manage_suites_page.py → pages/manage_suites_page.py
diff --git a/manage_versions_page.py → pages/manage_versions_page.py b/manage_versions_page.py → pages/manage_versions_page.py
diff --git a/page.py → pages/page.py b/page.py → pages/page.py
@@ -129,17 +129,17 @@ def wait_for_ajax(self, timeout=None):
     def record_error(self):
         ''' Records an error. '''
 
-        http_matches = http_regex.match(self.base_url)
-        file_name = http_matches.group(1)
-
-        print '-------------------'
-        print 'Error at ' + self.selenium.get_location()
-        print 'Page title ' + self.selenium.get_title()
-        print '-------------------'
-        filename = file_name + '_' + str(time.time()).split('.')[0] + '.png'
-
-        print 'Screenshot of error in file ' + filename
-        f = open(filename, 'wb')
-        f.write(base64.decodestring(
-            self.selenium.capture_entire_page_screenshot_to_string('')))
-        f.close()
+        #http_matches = http_regex.match(self.base_url)
+        #file_name = http_matches.group(1)
+        #
+        #print '-------------------'
+        #print 'Error at ' + self.selenium.get_location()
+        #print 'Page title ' + self.selenium.get_title()
+        #print '-------------------'
+        #filename = file_name + '_' + str(time.time()).split('.')[0] + '.png'
+        #
+        #print 'Screenshot of error in file ' + filename
+        #f = open(filename, 'wb')
+        #f.write(base64.decodestring(
+        #    self.selenium.capture_entire_page_screenshot_to_string('')))
+        #f.close()
diff --git a/run_tests_page.py → pages/run_tests_page.py b/run_tests_page.py → pages/run_tests_page.py
diff --git a/requirements/mozwebqa.txt → requirements.txt b/requirements/mozwebqa.txt → requirements.txt
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/test_homepage.py → tests/test_homepage.py b/test_homepage.py → tests/test_homepage.py
@@ -4,15 +4,15 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from home_page import MozTrapHomePage
-from base_test import BaseTest
+from pages.home_page import MozTrapHomePage
+from pages.base_test import BaseTest
 from unittestzero import Assert
 
 
 class TestHomepage(BaseTest):
 
     def test_that_user_can_login_and_logout(self, mozwebqa):
-        from login_page import MozTrapLoginPage
+        from pages.login_page import MozTrapLoginPage
         login_pg = MozTrapLoginPage(mozwebqa)
         home_pg = MozTrapHomePage(mozwebqa)
 

diff --git a/test_manage_cases_page.py → tests/test_manage_cases_page.py b/test_manage_cases_page.py → tests/test_manage_cases_page.py
@@ -4,8 +4,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from manage_cases_page import MozTrapManageCasesPage
-from base_test import BaseTest
+from pages.manage_cases_page import MozTrapManageCasesPage
+from pages.base_test import BaseTest
 from unittestzero import Assert
 
 

diff --git a/test_manage_products_page.py → tests/test_manage_products_page.py b/test_manage_products_page.py → tests/test_manage_products_page.py
@@ -4,8 +4,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from manage_products_page import MozTrapManageProductsPage
-from base_test import BaseTest
+from pages.manage_products_page import MozTrapManageProductsPage
+from pages.base_test import BaseTest
 from unittestzero import Assert
 
 

diff --git a/test_manage_profiles_page.py → tests/test_manage_profiles_page.py b/test_manage_profiles_page.py → tests/test_manage_profiles_page.py
@@ -4,15 +4,15 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from manage_profiles_page import MozTrapManageProfilesPage
-from base_test import BaseTest
+from pages.manage_profiles_page import MozTrapManageProfilesPage
+from pages.base_test import BaseTest
 from unittestzero import Assert
 
 
 class TestManageProfilesPage(BaseTest):
 
     def test_that_user_can_create_and_delete_profile(self, mozwebqa_logged_in):
-        from create_profile_page import MozTrapCreateProfilePage
+        from pages.create_profile_page import MozTrapCreateProfilePage
         manage_profiles_pg = MozTrapManageProfilesPage(mozwebqa_logged_in)
         create_profile_pg = MozTrapCreateProfilePage(mozwebqa_logged_in)
 

diff --git a/test_manage_runs_page.py → tests/test_manage_runs_page.py b/test_manage_runs_page.py → tests/test_manage_runs_page.py
@@ -4,8 +4,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from manage_runs_page import MozTrapManageRunsPage
-from base_test import BaseTest
+from pages.manage_runs_page import MozTrapManageRunsPage
+from pages.base_test import BaseTest
 from unittestzero import Assert
 
 

diff --git a/test_manage_suites_page.py → tests/test_manage_suites_page.py b/test_manage_suites_page.py → tests/test_manage_suites_page.py
@@ -4,8 +4,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from manage_suites_page import MozTrapManageSuitesPage
-from base_test import BaseTest
+from pages.manage_suites_page import MozTrapManageSuitesPage
+from pages.base_test import BaseTest
 from unittestzero import Assert
 
 

diff --git a/test_manage_versions_page.py → tests/test_manage_versions_page.py b/test_manage_versions_page.py → tests/test_manage_versions_page.py
@@ -4,8 +4,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from manage_versions_page import MozTrapManageVersionsPage
-from base_test import BaseTest
+from pages.manage_versions_page import MozTrapManageVersionsPage
+from pages.base_test import BaseTest
 from unittestzero import Assert
 
 

diff --git a/test_run_tests_page.py → tests/test_run_tests_page.py b/test_run_tests_page.py → tests/test_run_tests_page.py
@@ -4,8 +4,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from run_tests_page import MozTrapRunTestsPage
-from base_test import BaseTest
+from pages.run_tests_page import MozTrapRunTestsPage
+from pages.base_test import BaseTest
 from unittestzero import Assert