Revise tests based on recent changes

martinthomson · Aug 23, 2023 · 7fb57dd · 7fb57dd
1 parent c7fd961
commit 7fb57dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/ghpages.mk b/ghpages.mk
@@ -40,11 +40,14 @@ PUSH_GHPAGES ?= false
 # Pages is fetched from, and where it is pushed to. Different hosters have
 # different branch names for this purpose (if they do it that way at all).
 ifeq (github.com,$(GITHUB_HOST))
-	PAGES_BRANCH ?= gh-pages
+PAGES_BRANCH ?= gh-pages
+else ifeq (tmp,$(GITHUB_HOST))
+# OK, this is gross, but this is what happens when we are operating under test.
+PAGES_BRANCH ?= gh-pages
 else
-	# This is common across all Forgejo instances, and as there is no more
-	# generic default, this is also the catch-all.
-	PAGES_BRANCH ?= pages
+# This is common across all Forgejo instances, and as there is no more
+# generic default, this is also the catch-all.
+PAGES_BRANCH ?= pages
 endif
 
 .IGNORE: fetch-ghpages

diff --git a/tests/setup.feature b/tests/setup.feature
@@ -14,7 +14,6 @@ Feature: Initial setup
      and a file is created called ".github/workflows/publish.yml"
      and a file is created called ".github/workflows/archive.yml"
      and a file is created called ".github/CODEOWNERS"
-     and a file is created called ".note.xml"
      and a file is created called ".editorconfig"
      and a branch is created called "gh-pages" containing "index.html"
      and a branch is created called "gh-pages" containing "archive.json"
@@ -36,7 +35,6 @@ Feature: Initial setup
      and a file is created called ".github/workflows/publish.yml"
      and a file is created called ".github/workflows/archive.yml"
      and a file is created called ".github/CODEOWNERS"
-     and a file is created called ".note.xml"
      and a file is created called ".editorconfig"
      and a branch is created called "gh-pages" containing "index.html"
      and a branch is created called "gh-pages" containing "archive.json"
@@ -58,7 +56,6 @@ Feature: Initial setup
      and a file is created called ".github/workflows/publish.yml"
      and a file is created called ".github/workflows/archive.yml"
      and a file is created called ".github/CODEOWNERS"
-     and a file is created called ".note.xml"
      and a file is created called ".editorconfig"
      and a branch is created called "gh-pages" containing "index.md"
      and a branch is created called "gh-pages" containing "archive.json"