Commit 7053aff0 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Merge branch 'develop' into 'main' 

Merge develop into master

See merge request !30
parents 19f14bbd 0cb615e8

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ Build Images: 
    - plugins/*

    - scripts/*

  variables:

    PLATFORMS: ""

    BUILD_ARGS: >-

      wp_version=$WORDPRESS_VERSION

      php_version=$PHP_VERSION
@@ -45,6 +44,7 @@ Build Images: 
  parallel:

    matrix:

    - TARGET: [nginx, fastcgi]

      PLATFORMS: [""]

  trigger:

    include:

    - project: dom/project-templates

.pre-commit-config.yaml

+2 −2
Original line number Diff line number Diff line
@@ -90,10 +90,10 @@ repos: 
    - flake8-tabs



- repo: https://github.com/pre-commit/mirrors-mypy

  rev: v0.910

  rev: v0.982

  hooks:

  - id: mypy

    args: ["--config-file=.lint.cfg"]

    args: ["--config-file=.lint.cfg", "--python-version=3.9"]

    additional_dependencies:

    - types-requests

    - behave-utils ~=0.3.2

tests/environment.py

+1 −1
Original line number Diff line number Diff line 
#  Copyright 2021  Dominik Sekotill <dom.sekotill@kodo.org.uk>

#  Copyright 2021-2022  Dominik Sekotill <dom.sekotill@kodo.org.uk>

#

#  This Source Code Form is subject to the terms of the Mozilla Public

#  License, v. 2.0. If a copy of the MPL was not distributed with this

tests/steps/commands.py

+1 −1
Original line number Diff line number Diff line 
#  Copyright 2021  Dominik Sekotill <dom.sekotill@kodo.org.uk>

#  Copyright 2021-2022  Dominik Sekotill <dom.sekotill@kodo.org.uk>

#

#  This Source Code Form is subject to the terms of the Mozilla Public

#  License, v. 2.0. If a copy of the MPL was not distributed with this

tests/steps/pages.py

+4 −2
Original line number Diff line number Diff line 
#  Copyright 2021  Dominik Sekotill <dom.sekotill@kodo.org.uk>

#  Copyright 2021-2022  Dominik Sekotill <dom.sekotill@kodo.org.uk>

#

#  This Source Code Form is subject to the terms of the Mozilla Public

#  License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -64,7 +64,9 @@ def create_post(context: Context, post_type: PostType, text: str|None = None) -> 
	"""

	Create a WP post of the given type and store it in the context with the type as the name

	"""

	post = use_fixture(wp_post, context, post_type, text or getattr(context, "text", ""))

	text = text or getattr(context, "text", "")

	assert isinstance(text, str)

	post = use_fixture(wp_post, context, post_type, text)

	setattr(context, post_type.value, post)