diff --git a/src/apps/lyric/models.py b/src/apps/lyric/models.py index 8f16434..ef4cfb5 100644 --- a/src/apps/lyric/models.py +++ b/src/apps/lyric/models.py @@ -117,7 +117,7 @@ class Token(models.Model): if self.token_type == self.COIN: return "\u2026and another after that, and another after that\u2026" 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 def tooltip_text(self): diff --git a/src/functional_tests/test_game_kit.py b/src/functional_tests/test_game_kit.py index 0d7ba22..adf3297 100644 --- a/src/functional_tests/test_game_kit.py +++ b/src/functional_tests/test_game_kit.py @@ -24,10 +24,11 @@ class GameKitTest(FunctionalTest): ) self.assertTrue(kit_btn.is_displayed()) kit_btn.click() - dialog = self.wait_for( - lambda: self.browser.find_element(By.ID, "id_kit_bag_dialog") + self.wait_for( + 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): self.browser.get(self.gate_url) @@ -42,10 +43,12 @@ class GameKitTest(FunctionalTest): def test_kit_dialog_closes_on_escape(self): self.browser.get(self.gate_url) self.browser.find_element(By.ID, "id_kit_btn").click() - dialog = self.wait_for( - lambda: self.browser.find_element(By.ID, "id_kit_bag_dialog") + self.wait_for( + 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) self.wait_for( lambda: self.assertFalse( diff --git a/src/templates/apps/dashboard/_partials/_applets.html b/src/templates/apps/dashboard/_partials/_applets.html index 99342db..454460a 100644 --- a/src/templates/apps/dashboard/_partials/_applets.html +++ b/src/templates/apps/dashboard/_partials/_applets.html @@ -1,7 +1,6 @@ {% load lyric_extras %} -
- +
+
{% include "apps/applets/_partials/_applets.html" %}
\ No newline at end of file diff --git a/src/templates/apps/gameboard/_partials/_applet-game-kit.html b/src/templates/apps/gameboard/_partials/_applet-game-kit.html index 9abe694..d804afe 100644 --- a/src/templates/apps/gameboard/_partials/_applet-game-kit.html +++ b/src/templates/apps/gameboard/_partials/_applet-game-kit.html @@ -10,6 +10,9 @@

{{ pass_token.tooltip_name }}

{{ pass_token.tooltip_description }}

+ {% if pass_token.tooltip_shoptalk %} + {{ pass_token.tooltip_shoptalk }} + {% endif %}

{{ pass_token.tooltip_expiry }}