Merge pull request #131 from sandiegopython/davidfischer/run-ci-on-prs

Run CI on PRs / fix tests

Author: davidfischer

.github/workflows/ci.yml

@@ -1,7 +1,12 @@
+# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
 name: Continuous Integration Checks
 
-# All branches
-on: push
+# All PRs as well as pushes to main
+on:
+  push:
+    branches:
+    - main
+  pull_request:
 
 jobs:
   build:

pythonsd/sitemap.py

@@ -3,28 +3,28 @@
 
 
 class IndexSitemap(Sitemap):
-	changefreq = 'weekly'
-	protocol = 'https'
-	priority = 1.0
+    changefreq = "weekly"
+    protocol = "https"
+    priority = 1.0
 
-	def items(self):
-		return [
-			'index',
-		]
+    def items(self):
+        return [
+            "index",
+        ]
 
-	def location(self, item):
-		return reverse(item)
+    def location(self, item):
+        return reverse(item)
 
 
 class StaticViewSitemap(Sitemap):
-	changefreq = 'monthly'
-	protocol = 'https'
-	priority = 0.8
+    changefreq = "monthly"
+    protocol = "https"
+    priority = 0.8
 
-	def items(self):
-		return [
-			'code-of-conduct',
-		]
+    def items(self):
+        return [
+            "code-of-conduct",
+        ]
 
-	def location(self, item):
-		return reverse(item)
+    def location(self, item):
+        return reverse(item)

pythonsd/tests/__init__.py

@@ -214,6 +214,12 @@ def test_api_error(self):
         self.assertContains(response, "Check out our")
 
 
+class TestSitemap(test.TestCase):
+    def test_sitemap(self):
+        resp = self.client.get("/sitemap.xml")
+        self.assertEqual(resp.status_code, 200)
+
+
 class TestWSGIApp(unittest.TestCase):
     @classmethod
     def setUpClass(cls):

pythonsd/urls.py

@@ -7,8 +7,8 @@
 from .sitemap import IndexSitemap, StaticViewSitemap
 
 sitemaps = {
-	"index": IndexSitemap,
-	"static": StaticViewSitemap,
+    "index": IndexSitemap,
+    "static": StaticViewSitemap,
 }
 
 
@@ -26,8 +26,12 @@
     # XHR/Async requests
     path(r"xhr/events/", views.UpcomingEventsView.as_view(), name="upcoming_events"),
     path(r"xhr/videos/", views.RecentVideosView.as_view(), name="recent_videos"),
-	path(r"sitemap.xml", sitemap, {"sitemaps": sitemaps},
-        	name="django.contrib.sitemaps.views.sitemap"),
+    path(
+        r"sitemap.xml",
+        sitemap,
+        {"sitemaps": sitemaps},
+        name="django.contrib.sitemaps.views.sitemap",
+    ),
 ]
 
 # These redirects handle redirecting URLs from the old static site to the new Django site