#id_dash_applet_menu now outside #id_applets_container to avoid clipping, other issues (FTs passed locally, but not in headless CI pipeline); selenium now calls wait_for when looking for is_displayed on kit bag menu (hopefully another CI fix)
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
This commit is contained in:
@@ -117,7 +117,7 @@ class Token(models.Model):
|
|||||||
if self.token_type == self.COIN:
|
if self.token_type == self.COIN:
|
||||||
return "\u2026and another after that, and another after that\u2026"
|
return "\u2026and another after that, and another after that\u2026"
|
||||||
if self.token_type == self.PASS:
|
if self.token_type == self.PASS:
|
||||||
return "\u2018Entry fee\u2019? Do you know who you\u2019re talking to?"
|
return "\u2018Entry fee\u2019? Pal, do you know who you\u2019re talking to?"
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def tooltip_text(self):
|
def tooltip_text(self):
|
||||||
|
|||||||
@@ -24,10 +24,11 @@ class GameKitTest(FunctionalTest):
|
|||||||
)
|
)
|
||||||
self.assertTrue(kit_btn.is_displayed())
|
self.assertTrue(kit_btn.is_displayed())
|
||||||
kit_btn.click()
|
kit_btn.click()
|
||||||
dialog = self.wait_for(
|
self.wait_for(
|
||||||
lambda: self.browser.find_element(By.ID, "id_kit_bag_dialog")
|
lambda: self.assertTrue(
|
||||||
|
self.browser.find_element(By.ID, "id_kit_bag_dialog").is_displayed()
|
||||||
|
)
|
||||||
)
|
)
|
||||||
self.assertTrue(dialog.is_displayed())
|
|
||||||
|
|
||||||
def test_kit_dialog_shows_token_cards(self):
|
def test_kit_dialog_shows_token_cards(self):
|
||||||
self.browser.get(self.gate_url)
|
self.browser.get(self.gate_url)
|
||||||
@@ -42,10 +43,12 @@ class GameKitTest(FunctionalTest):
|
|||||||
def test_kit_dialog_closes_on_escape(self):
|
def test_kit_dialog_closes_on_escape(self):
|
||||||
self.browser.get(self.gate_url)
|
self.browser.get(self.gate_url)
|
||||||
self.browser.find_element(By.ID, "id_kit_btn").click()
|
self.browser.find_element(By.ID, "id_kit_btn").click()
|
||||||
dialog = self.wait_for(
|
self.wait_for(
|
||||||
lambda: self.browser.find_element(By.ID, "id_kit_bag_dialog")
|
lambda: self.assertTrue(
|
||||||
|
self.browser.find_element(By.ID, "id_kit_bag_dialog").is_displayed()
|
||||||
)
|
)
|
||||||
self.assertTrue(dialog.is_displayed())
|
)
|
||||||
|
dialog = self.browser.find_element(By.ID, "id_kit_bag_dialog")
|
||||||
dialog.send_keys(Keys.ESCAPE)
|
dialog.send_keys(Keys.ESCAPE)
|
||||||
self.wait_for(
|
self.wait_for(
|
||||||
lambda: self.assertFalse(
|
lambda: self.assertFalse(
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
{% load lyric_extras %}
|
{% load lyric_extras %}
|
||||||
|
|
||||||
<div id="id_applets_container">
|
<div id="id_dash_applet_menu" style="display:none;">
|
||||||
<div id="id_dash_applet_menu" style="display:none;">
|
|
||||||
<form
|
<form
|
||||||
hx-post="{% url "toggle_applets" %}"
|
hx-post="{% url "toggle_applets" %}"
|
||||||
hx-target="#id_applets_container"
|
hx-target="#id_applets_container"
|
||||||
@@ -24,6 +23,7 @@
|
|||||||
<button type="button" id="id_applet_menu_cancel" class="btn btn-cancel applet-menu-cancel">NVM</button>
|
<button type="button" id="id_applet_menu_cancel" class="btn btn-cancel applet-menu-cancel">NVM</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
<div id="id_applets_container">
|
||||||
{% include "apps/applets/_partials/_applets.html" %}
|
{% include "apps/applets/_partials/_applets.html" %}
|
||||||
</div>
|
</div>
|
||||||
@@ -10,6 +10,9 @@
|
|||||||
<div class="token-tooltip">
|
<div class="token-tooltip">
|
||||||
<h4>{{ pass_token.tooltip_name }}</h4>
|
<h4>{{ pass_token.tooltip_name }}</h4>
|
||||||
<p>{{ pass_token.tooltip_description }}</p>
|
<p>{{ pass_token.tooltip_description }}</p>
|
||||||
|
{% if pass_token.tooltip_shoptalk %}
|
||||||
|
<small><em>{{ pass_token.tooltip_shoptalk }}</em></small>
|
||||||
|
{% endif %}
|
||||||
<p class="expiry">{{ pass_token.tooltip_expiry }}</p>
|
<p class="expiry">{{ pass_token.tooltip_expiry }}</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user