diff --git a/Gruntfile.js b/Gruntfile.js index 92be7da9d..e626a1d85 100755 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -95,7 +95,7 @@ module.exports = function (grunt) { } }, test_server_functional: { - command: 'nosetests3 tests/functional/' + command: 'pytest tests/functional/' }, test_client: { command: 'npm run test' diff --git a/controllers/default.py b/controllers/default.py index 1d94cdda9..3b54e2e8a 100755 --- a/controllers/default.py +++ b/controllers/default.py @@ -1807,7 +1807,7 @@ def licence(): return dict() def news(): - redirect(URL('default', 'milestones.html')) + redirect(URL('default', 'timeline.html')) return dict() diff --git a/models/db.py b/models/db.py index 0bae8e5d5..cc69da97a 100755 --- a/models/db.py +++ b/models/db.py @@ -2,6 +2,7 @@ import os.path import img import json +import os ######################################################################### ## This scaffolding model makes your app work on Google App Engine too @@ -24,17 +25,18 @@ ## this will also set migration=False for all tables, so that the DB table definitions are fixed is_testing = True +custom_appconfig_path = os.environ.get('ONEZOOM_APPCONFIG') + ## Read configuration if ( is_testing and - request.env.cmd_options is not None and - len(request.env.cmd_options.args) > 1 and - os.path.isfile(request.env.cmd_options.args[-1]) + custom_appconfig_path and + os.path.isfile(custom_appconfig_path) ): # For unit testing, we might want to load a different appconfig.ini file, which can # be passed in to the rocket server as the last arg on the command-line (on the main # server, `request.env.cmd_options` is undefined, and we default back to appconfig.ini) - myconf = AppConfig(request.env.cmd_options.args[-1], reload=is_testing) + myconf = AppConfig(custom_appconfig_path, reload=is_testing) else: # Reload config on each request when is_testing (i.e. not production) myconf = AppConfig(reload=is_testing) diff --git a/tests/benchmarking/API/test_textsearch.py b/tests/benchmarking/API/test_textsearch.py index 3cd6dca0c..769ec7b97 100755 --- a/tests/benchmarking/API/test_textsearch.py +++ b/tests/benchmarking/API/test_textsearch.py @@ -168,7 +168,7 @@ class TestTextsearch(object): replicates = 3 @classmethod - def setUpClass(self): + def setup_class(self): self.web2py = Web2py_server() wait_for_server_active() colorama.init() diff --git a/tests/benchmarking/test_viewer_loading.py b/tests/benchmarking/test_viewer_loading.py index 1c1bac898..3027da02f 100644 --- a/tests/benchmarking/test_viewer_loading.py +++ b/tests/benchmarking/test_viewer_loading.py @@ -2,8 +2,8 @@ """ """ -from ...util import base_url -from ..functional_tests import FunctionalTest +from ..util import base_url +from ..functional.functional_tests import FunctionalTest import os.path class TestViewerLoading(FunctionalTest): @@ -11,9 +11,9 @@ class TestViewerLoading(FunctionalTest): Test whether the viewer loading functions work """ @classmethod - def setUpClass(self): + def setup_class(self): print("== Running {} ==".format(os.path.basename(__file__))) - super().setUpClass() + super().setup_class() def test_viewer_loading_time(self): """ diff --git a/tests/functional/functional_tests.py b/tests/functional/functional_tests.py index 55f59e275..bacafe838 100755 --- a/tests/functional/functional_tests.py +++ b/tests/functional/functional_tests.py @@ -3,22 +3,19 @@ """Carry out functional tests on OneZoom pages using an automated browser via selenium Example: carry out all tests - nosetests -w ./ tests/functional + python -m pytest ./ tests/functional Example: carry out all tests for unsponsorable sites (museum displays) - nosetests -vs functional/sponsorship/test_unsponsorable_site.py + python -m pytest -s functional/sponsorship/test_unsponsorable_site.py Example: carry out test that unsponsorable sites give the correct page for invalid otts - nosetests -vs functional/sponsorship/test_unsponsorable_site.py:TestUnsponsorableSite.test_invalid - - If you have installed the 'rednose' package (pip3 install rednose), you can get nicer output by e.g. - - nosetests -vs ./tests/functional --rednose + python -m pytest -s functional/sponsorship/test_unsponsorable_site.py:TestUnsponsorableSite.test_invalid To carry out tests on a remote machine, you can specify a [url][server] and [url][port] in a config file, which will not give the FunctionalTest class an is_local attribute and hence will skip tests marked @attr('is_local'). E.g. for testing beta.onezoom.org, you can do - + TODO: this is not yet implemented for the functional tests + in nosetests we used to do... nosetests -vs ./tests/functional --rednose --tc-file beta_cfg.ini - + """ import sys @@ -26,7 +23,6 @@ import os import re from datetime import datetime -from nose import tools import requests import subprocess import logging @@ -52,7 +48,7 @@ class FunctionalTest(object): is_local = Web2py_server.is_local() @classmethod - def setUpClass(self): + def setup_class(self): def striptext_in_file(line, file): """ look for the line as a starting line in the file, stripping whitespace @@ -69,7 +65,7 @@ def striptext_in_file(line, file): try: - self.web2py = Web2py_server(self.appconfig_loc) + self.web2py = Web2py_server(self.test_appconfig_loc) except AttributeError: self.web2py = Web2py_server() @@ -97,55 +93,50 @@ def striptext_in_file(line, file): selenium_logger.setLevel(logging.WARNING) #chrome_options = webdriver.ChromeOptions() #chrome_options.add_experimental_option("mobileEmulation", { "deviceName": "iPhone 7" }) - self.caps = webdriver.ChromeOptions().to_capabilities() + chrome_options = webdriver.ChromeOptions() # enable browser logging - self.caps['loggingPrefs'] = { 'browser':'ALL' } - self.browser = webdriver.Chrome(desired_capabilities = self.caps) + chrome_options.set_capability('goog:loggingPrefs', { 'browser':'ALL' }) + self.browser = webdriver.Chrome(options=chrome_options) self.browser.implicitly_wait(1) @classmethod - def tearDownClass(self): + def teardown_class(self): #should test here that we don't have any console.log errors (although we might have logs). self.browser.quit() self.web2py.stop_server() - def setup(self): + def setup_method(self): """ By default, clear logs before each test """ self.clear_log() - def teardown(self): + def teardown_method(self): """ By default, check javascript errors after each test. If you don't want to do this, e.g. for iframes, thic can be overridden """ self.clear_log(check_errors=True) - @tools.nottest def element_by_tag_name_exists(self, tag_name): - try: self.browser.find_element_by_tag_name(tag_name) + try: self.browser.find_element(By.TAG_NAME, tag_name) except NoSuchElementException: return False return True - @tools.nottest def element_by_id_exists(self, id): - try: self.browser.find_element_by_id(id) + try: self.browser.find_element(By.ID, id) except NoSuchElementException: return False return True - @tools.nottest def element_by_class_exists(self, cls): - try: self.browser.find_element_by_class_name(cls) + try: self.browser.find_element(By.CLASS_NAME, cls) except NoSuchElementException: return False return True - @tools.nottest def element_by_css_selector_exists(self, css): - try: self.browser.find_element_by_css_selector(css) + try: self.browser.find_element(By.CSS_SELECTOR, css) except NoSuchElementException: return False return True - @tools.nottest def clear_log(self, check_errors=False): log = self.browser.get_log('browser') if check_errors: @@ -155,7 +146,6 @@ def clear_log(self, check_errors=False): if not (message['message'].startswith("https://media.eol.org/content") and "404 (Not Found)" in message['message']): assert False, "Javascript issue of level {}, : {}".format(message['level'], message['message']) - @tools.nottest def zoom_disabled(self): """ Check that the touch zoom functionality is disabled. @@ -209,17 +199,17 @@ def has_linkouts(browser, include_site_internal): Depending on the param passed in, we may want to allow internal (relative) links such as """ - for tag in browser.find_elements_by_css_selector("[href^='http']"): + for tag in browser.find_elements(By.CSS_SELECTOR, "[href^='http']"): if tag.tag_name != u'link' and not tag.get_attribute('href').startswith('http://127.0.0.1'): #should allow e.g. and http://127.0.0.1:.. return True - for tag in browser.find_elements_by_css_selector("[href^='//']"): + for tag in browser.find_elements(By.CSS_SELECTOR, "[href^='//']"): if tag.tag_name != u'link': #should allow e.g. return True #all hrefs should now be http or https refs to local stuff. We should double check this #by looking at the tag.attribute which is fully expanded by selenium/chrome to include http #but we should exclude all page-local links (i.e. beginning with #) - for tag in browser.find_elements_by_css_selector('[href]:not([href^="#"])'): + for tag in browser.find_elements(By.CSS_SELECTOR, '[href]:not([href^="#"])'): if tag.tag_name != u'link': if include_site_internal: return True @@ -234,13 +224,13 @@ def has_linkouts(browser, include_site_internal): def web2py_date_accessed(browser): #assumes that we have injected the access date into a meta element called 'date_accessed' #using the web2py code {{response.meta.date_accessed = request.now}} - return datetime.strptime(browser.find_element_by_xpath("//meta[@name='date_accessed']").get_attribute("content"), date_format) + return datetime.strptime(browser.find_element(By.XPATH, "//meta[@name='date_accessed']").get_attribute("content"), date_format) def web2py_viewname_contains(browser, expected_view): #Checks if we have injected the view name into a meta element called 'viewfile' #using the web2py code {{response.meta.viewfile = response.view}} try: - return expected_view in browser.find_element_by_xpath("//meta[@name='viewfile']").get_attribute("content") + return expected_view in browser.find_element(By.XPATH, "//meta[@name='viewfile']").get_attribute("content") except NoSuchElementException: return False @@ -278,7 +268,7 @@ def make_temp_minlife_file(self): f.write(response.content) self.temp_minlife_created += [minlife_file_location.format(i)] #process links (see the partial_install command in Gruntfile.js in the app dir) - subprocess.call(['perl', '-i', os.path.join(web2py_app_dir, 'OZprivate','ServerScripts','Utilities','partial_install.pl'), minlife_file_location.format(i)]) + subprocess.call([sys.executable, os.path.join(web2py_app_dir, 'OZprivate','ServerScripts','Utilities','partial_install.py'), minlife_file_location.format(i)]) return minlife_file_location.format(i) else: raise Exception("There are already many test files in {}. Please remove some before continuing".format(minlife_file_location)) diff --git a/tests/functional/sponsorship/sponsorship_tests.py b/tests/functional/sponsorship/sponsorship_tests.py index da7860f70..5112d335f 100644 --- a/tests/functional/sponsorship/sponsorship_tests.py +++ b/tests/functional/sponsorship/sponsorship_tests.py @@ -2,13 +2,11 @@ # -*- coding: utf-8 -*- import os import requests -from nose import tools -from time import sleep from selenium import webdriver #to fire up a duplicate page from ...util import appconfig_loc, base_url -from ..functional_tests import FunctionalTest, test_email, web2py_viewname_contains, has_linkouts, linkouts_url +from ..functional_tests import FunctionalTest, test_email, has_linkouts, linkouts_url class SponsorshipTest(FunctionalTest): @@ -17,23 +15,23 @@ class SponsorshipTest(FunctionalTest): """ @classmethod - def setUpClass(self): + def setup_class(self): """ When setting up the sponsorship pages testing suite we have to create a new appconfig.ini file and point out web2py instance at it so that we can adjust maintenance_mins and allow_sponsorship """ print(">> creating temporary appconfig") - self.appconfig_loc = appconfig_loc + '.test_orig.ini' - with open(appconfig_loc, "r") as orig, open(self.appconfig_loc, "w") as test: + self.test_appconfig_loc = appconfig_loc + '.sponsorhip_test.ini' + with open(appconfig_loc, "r") as orig, open(self.test_appconfig_loc, "w") as test_appconfig_file: for line in orig: if line.lstrip().startswith("maintenance_mins") or line.lstrip().startswith("allow_sponsorship"): - pass #do not write these out + pass # skip existing maintenance_mins and allow_sponsorship settings else: - test.write(line) + test_appconfig_file.write(line) if line.lstrip().startswith("[sponsorship]"): - test.write("maintenance_mins = {}\n".format(self.maintenance_mins)) - test.write("allow_sponsorship = {}\n".format(self.allow_sponsorship)) - super().setUpClass() + test_appconfig_file.write("maintenance_mins = {}\n".format(self.maintenance_mins)) + test_appconfig_file.write("allow_sponsorship = {}\n".format(self.allow_sponsorship)) + super().setup_class() #Now get s, from the "normal" OZ viewer, from a museum display, #from a partner view and also a test case where all links are banned @@ -58,13 +56,12 @@ def setUpClass(self): } @classmethod - def tearDownClass(self): - super().tearDownClass() + def teardown_class(self): + super().teardown_class() print(">> removing temporary appconfig") - os.remove(self.appconfig_loc) + os.remove(self.test_appconfig_loc) - @tools.nottest - def test_ott(self, extra_assert_tests, ott, extra_assert_tests_from_another_browser=None, browser=None): + def check_ott(self, extra_assert_tests, ott, extra_assert_tests_from_another_browser=None, browser=None): """ Test the 4 separate urls, each viewing the same page linked from a different place (e.g. from the OZ tree viewer versus the min website, vs a museum display) @@ -85,7 +82,7 @@ def test_ott(self, extra_assert_tests, ott, extra_assert_tests_from_another_brow #still forwards to the same page print(" ... also testing same pages from an alternative browser ...", end="", flush=True) alt_browser = webdriver.Chrome() - self.test_ott(extra_assert_tests_from_another_browser, ott, None, alt_browser) + self.check_ott(extra_assert_tests_from_another_browser, ott, None, alt_browser) alt_browser.quit() #check all the alternative representations too print("|w2p", end="", flush=True) @@ -107,29 +104,7 @@ def test_ott(self, extra_assert_tests, ott, extra_assert_tests_from_another_brow assert has_linkouts(browser, include_site_internal=True) == False assert self.zoom_disabled() print(" ", end="", flush=True) - - @tools.nottest - def test_md_sandbox(self, ott): - """ - Follow any links from the museum display page and collect a list. If any are external, return False - """ - self.browser.get(self.urls['treeviewer_md'](ott)) - #Although any element can potentially link out to another page using javascript, - # the most likely elements that will cause a sandbox escape on our own page - # are
, or