extensive refactor push to continue to liberate applets from dashboard; new _applets.html & .gear.html template partials for use across all -board views; all applets.html sections have been liberated into their own _applet-<applet-name>.html template partials in their respective templates/apps/*board/_partials/ dirs; gameboard.html & home.html greatly simplified; .gear-btn describes gear menu now, #id_<*board nickname>*gear IDs abandoned; as such, .gear-btn styling moved from _dashboard.scss to _base.scss; new applets.js file contains related initGearMenus scripts, which no longer waits for window reload; new apps.applets.utils file manages applet_context() fn; new gameboard.js file but currently empty (false start); updates across all sorts of ITs & dash- & gameboard FTs
This commit is contained in:
@@ -1,14 +1,19 @@
|
||||
import lxml.html
|
||||
|
||||
from django.test import TestCase
|
||||
from django.urls import reverse
|
||||
|
||||
from apps.applets.models import Applet, UserApplet
|
||||
from apps.lyric.models import User
|
||||
|
||||
|
||||
class GameboardViewTest(TestCase):
|
||||
def setUp(self):
|
||||
self.user = User.objects.create(email="capman@test.io")
|
||||
self.user = User.objects.create(email="gamer@test.io")
|
||||
self.client.force_login(self.user)
|
||||
Applet.objects.get_or_create(slug="new-game", defaults={"name": "New Game", "context": "gameboard"})
|
||||
Applet.objects.get_or_create(slug="my-games", defaults={"name": "My Games", "context": "gameboard"})
|
||||
Applet.objects.get_or_create(slug="game-kit", defaults={"name": "Game Kit", "context": "gameboard"})
|
||||
response = self.client.get("/gameboard/")
|
||||
self.parsed = lxml.html.fromstring(response.content)
|
||||
|
||||
@@ -33,7 +38,7 @@ class GameboardViewTest(TestCase):
|
||||
[_] = self.parsed.cssselect("#id_game_kit_btn")
|
||||
|
||||
def test_gameboard_shows_game_gear(self):
|
||||
[_] = self.parsed.cssselect("#id_game_gear")
|
||||
[_] = self.parsed.cssselect(".gear-btn")
|
||||
|
||||
def test_my_games_has_no_game_items_for_new_user(self):
|
||||
game_items = self.parsed.cssselect("#id_applet_my_games .game-item")
|
||||
@@ -50,3 +55,49 @@ class GameboardViewTest(TestCase):
|
||||
|
||||
def test_game_kit_has_dice_set_placeholder(self):
|
||||
[_] = self.parsed.cssselect("#id_game_kit #id_kit_dice_set")
|
||||
|
||||
|
||||
class ToggleGameAppletsViewTest(TestCase):
|
||||
def setUp(self):
|
||||
self.user = User.objects.create(email="gamer@test.io")
|
||||
self.client.force_login(self.user)
|
||||
self.new_game, _ = Applet.objects.get_or_create(
|
||||
slug="new-game", defaults={"name": "New Game", "context": "gameboard"}
|
||||
)
|
||||
self.my_games, _ = Applet.objects.get_or_create(
|
||||
slug="my-games", defaults={"name": "My Games", "context": "gameboard"}
|
||||
)
|
||||
self.url = reverse("toggle_game_applets")
|
||||
|
||||
def test_unauthenticated_user_is_redirected(self):
|
||||
self.client.logout()
|
||||
response = self.client.post(self.url)
|
||||
self.assertRedirects(
|
||||
response, f"/?next={self.url}", fetch_redirect_response=False
|
||||
)
|
||||
|
||||
def test_unchecked_applet_gets_user_applet_with_visible_false(self):
|
||||
self.client.post(self.url, {"applets": ["new-game"]})
|
||||
ua = UserApplet.objects.get(user=self.user, applet=self.my_games)
|
||||
self.assertFalse(ua.visible)
|
||||
|
||||
def test_redirects_on_normal_post(self):
|
||||
response = self.client.post(self.url, {"applets": ["new-game", "my-games"]})
|
||||
self.assertRedirects(
|
||||
response, reverse("gameboard"), fetch_redirect_response=False
|
||||
)
|
||||
|
||||
def test_returns_200_on_htmx_post(self):
|
||||
response = self.client.post(
|
||||
self.url,
|
||||
{"applets": ["new-game", "my-games"]},
|
||||
HTTP_HX_REQUEST="true",
|
||||
)
|
||||
self.assertEqual(response.status_code, 200)
|
||||
|
||||
def test_does_not_affect_dash_applets(self):
|
||||
dash_applet, _ = Applet.objects.get_or_create(
|
||||
slug="username", defaults={"name": "Username", "context": "dashboard"}
|
||||
)
|
||||
self.client.post(self.url, {"applets": ["new-game", "my-games"]})
|
||||
self.assertFalse(UserApplet.objects.filter(user=self.user, applet=dash_applet).exists())
|
||||
|
||||
@@ -5,5 +5,6 @@ from . import views
|
||||
|
||||
urlpatterns = [
|
||||
path('', views.gameboard, name='gameboard'),
|
||||
path('toggle-applets', views.toggle_game_applets, name='toggle_game_applets'),
|
||||
]
|
||||
|
||||
|
||||
@@ -1,9 +1,18 @@
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from django.shortcuts import render
|
||||
from django.shortcuts import redirect, render
|
||||
|
||||
from apps.applets.utils import applet_context
|
||||
from apps.applets.models import Applet, UserApplet
|
||||
from apps.lyric.models import Token
|
||||
|
||||
|
||||
GAMEBOARD_APPLET_ORDER = [
|
||||
"new-game",
|
||||
"my-games",
|
||||
"game-kit",
|
||||
]
|
||||
|
||||
|
||||
@login_required(login_url="/")
|
||||
def gameboard(request):
|
||||
coin = request.user.tokens.filter(token_type=Token.COIN).first()
|
||||
@@ -12,5 +21,23 @@ def gameboard(request):
|
||||
request, "apps/gameboard/gameboard.html", {
|
||||
"coin": coin,
|
||||
"free_tokens": free_tokens,
|
||||
"applets": applet_context(request.user, "gameboard"),
|
||||
}
|
||||
)
|
||||
|
||||
@login_required(login_url="/")
|
||||
def toggle_game_applets(request):
|
||||
checked = request.POST.getlist("applets")
|
||||
for applet in Applet.objects.filter(context="gameboard"):
|
||||
UserApplet.objects.update_or_create(
|
||||
user=request.user,
|
||||
applet=applet,
|
||||
defaults={"visible": applet.slug in checked},
|
||||
)
|
||||
if request.headers.get("HX-Request"):
|
||||
return render(request, "apps/gameboard/_partials/_applets.html", {
|
||||
"applets": applet_context(request.user, "gameboard"),
|
||||
"coin": request.user.tokens.filter(token_type=Token.COIN).first(),
|
||||
"free_tokens": list(request.user.tokens.filter(token_type=Token.FREE)),
|
||||
})
|
||||
return redirect("gameboard")
|
||||
|
||||
Reference in New Issue
Block a user