UX: Allow event time to be hidden if desired (#606)
* Allow event time to be hidden if desired * spec adjustment * re: feedback * Update test/javascripts/integration/components/upcoming-events-list-test.gjs Co-authored-by: Jarek Radosz <jradosz@gmail.com> --------- Co-authored-by: Jarek Radosz <jradosz@gmail.com>
This commit is contained in:
parent
3020fa9f27
commit
f83605c30b
|
|
@ -181,9 +181,12 @@ export default class UpcomingEventsList extends Component {
|
||||||
class="upcoming-events-list__event"
|
class="upcoming-events-list__event"
|
||||||
href={{event.post.url}}
|
href={{event.post.url}}
|
||||||
>
|
>
|
||||||
|
{{#if this.timeFormat}}
|
||||||
<div class="upcoming-events-list__event-time">
|
<div class="upcoming-events-list__event-time">
|
||||||
{{this.formatTime event}}
|
{{this.formatTime event}}
|
||||||
</div>
|
</div>
|
||||||
|
{{/if}}
|
||||||
|
|
||||||
<div class="upcoming-events-list__event-name">
|
<div class="upcoming-events-list__event-name">
|
||||||
{{or event.name event.post.topic.title}}
|
{{or event.name event.post.topic.title}}
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -189,11 +189,6 @@ module("Integration | Component | upcoming-events-list", function (hooks) {
|
||||||
|
|
||||||
await waitFor(".loading-container .spinner", { count: 0 });
|
await waitFor(".loading-container .spinner", { count: 0 });
|
||||||
|
|
||||||
assert.ok(
|
|
||||||
!exists(".upcoming-events-list__formatted-month"),
|
|
||||||
"it omits the formatted month when empty"
|
|
||||||
);
|
|
||||||
|
|
||||||
assert.deepEqual(
|
assert.deepEqual(
|
||||||
[...queryAll(".upcoming-events-list__formatted-day")].map(
|
[...queryAll(".upcoming-events-list__formatted-day")].map(
|
||||||
(el) => el.innerText
|
(el) => el.innerText
|
||||||
|
|
@ -224,6 +219,34 @@ module("Integration | Component | upcoming-events-list", function (hooks) {
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("with events, omitted formats", async function (assert) {
|
||||||
|
pretender.get("/discourse-post-event/events", twoEventsResponseHandler);
|
||||||
|
await render(<template>
|
||||||
|
<UpcomingEventsList @params={{hash monthFormat="" timeFormat=""}} />
|
||||||
|
</template>);
|
||||||
|
|
||||||
|
this.appEvents.trigger("page:changed", { url: "/" });
|
||||||
|
|
||||||
|
assert
|
||||||
|
.dom(".upcoming-events-list__heading")
|
||||||
|
.hasText(
|
||||||
|
I18n.t(
|
||||||
|
"discourse_calendar.discourse_post_event.upcoming_events_list.title"
|
||||||
|
),
|
||||||
|
"it displays the title"
|
||||||
|
);
|
||||||
|
|
||||||
|
await waitFor(".loading-container .spinner", { count: 0 });
|
||||||
|
|
||||||
|
assert
|
||||||
|
.dom(".upcoming-events-list__formatted-month")
|
||||||
|
.doesNotExist("it omits the formatted month when empty");
|
||||||
|
|
||||||
|
assert
|
||||||
|
.dom(".upcoming-events-list__formatted-time")
|
||||||
|
.doesNotExist("it omits the formatted time when empty");
|
||||||
|
});
|
||||||
|
|
||||||
test("with an error response", async function (assert) {
|
test("with an error response", async function (assert) {
|
||||||
pretender.get("/discourse-post-event/events", () => {
|
pretender.get("/discourse-post-event/events", () => {
|
||||||
return response(500, {});
|
return response(500, {});
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue