Skip to content

Commit 1cd0a69

Browse files
committed
fix: Feedzy Loop button not working with Groups
1 parent d6f868e commit 1cd0a69

File tree

3 files changed

+44
-8
lines changed

3 files changed

+44
-8
lines changed

js/FeedzyLoop/components/FeedControl.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/**
22
* WordPress dependencies.
33
*/
4+
import { __ } from '@wordpress/i18n';
5+
46
import { useState, useEffect, useRef } from '@wordpress/element';
57

68
const FeedControl = ({ value, options, onChange }) => {
@@ -80,7 +82,10 @@ const FeedControl = ({ value, options, onChange }) => {
8082
value={selectedOption ? selectedOption.label : inputValue}
8183
onChange={handleInputChange}
8284
onBlur={handleInputBlur}
83-
placeholder="Enter URLs or select a category"
85+
placeholder={__(
86+
'Enter URLs or select a Feed Group',
87+
'feedzy-rss-feeds'
88+
)}
8489
disabled={selectedOption !== null}
8590
className="fz-input-field"
8691
/>
@@ -89,7 +94,7 @@ const FeedControl = ({ value, options, onChange }) => {
8994
<button
9095
onClick={handleClear}
9196
className="fz-clear-button"
92-
title="Clear selection"
97+
title={__('Clear', 'feedzy-rss-feeds')}
9398
>
9499
<svg
95100
width="14"
@@ -111,6 +116,7 @@ const FeedControl = ({ value, options, onChange }) => {
111116
<button
112117
onClick={() => setIsOpen(!isOpen)}
113118
className="fz-dropdown-button"
119+
title={__('Select Feed Group', 'feedzy-rss-feeds')}
114120
>
115121
<svg
116122
width="12"

js/FeedzyLoop/placeholder.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,7 @@ const BlockPlaceholder = ({ attributes, setAttributes, onSaveFeed }) => {
8282
<Button
8383
variant="primary"
8484
onClick={() => {
85-
if (
86-
attributes?.feed?.source &&
87-
attributes?.feed?.source.length > 0
88-
) {
85+
if (attributes?.feed?.source) {
8986
onSaveFeed();
9087
}
9188
}}

tests/e2e/specs/loop.spec.js

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,17 @@ test.describe('Feedzy Loop', () => {
99
const POST_TITLE = `Feedzy Loop Test ${Math.floor(Math.random() * 1000)}`;
1010

1111
test('add Feedzy Loop Block', async ({ editor, page }) => {
12+
await page.goto('/wp-admin/post-new.php?post_type=feedzy_categories');
13+
await page.getByLabel('Add title').click();
14+
await page.keyboard.type('Group One');
15+
16+
await page.locator('textarea[name="feedzy_category_feed"]').click();
17+
await page.keyboard.type(FEED_URL);
18+
await page
19+
.getByRole('button', { name: 'Publish', exact: true })
20+
.click();
21+
await page.waitForTimeout(1000);
22+
1223
await page.goto('/wp-admin/post-new.php');
1324

1425
if (
@@ -36,13 +47,35 @@ test.describe('Feedzy Loop', () => {
3647
await page.getByPlaceholder('Enter URLs or select a').click();
3748
await page.keyboard.type(FEED_URL);
3849

50+
const loadFeedButton = await page.getByRole('button', {
51+
name: 'Load Feed',
52+
exact: true,
53+
});
54+
const isDisabled = await loadFeedButton.isDisabled();
55+
expect(isDisabled).toBe(false);
56+
await loadFeedButton.click();
57+
await page.waitForTimeout(1000);
58+
59+
await page.getByLabel('Display curated RSS content').click();
60+
await page.waitForTimeout(1000);
61+
62+
// Now that we have tested we can insert URL, we can test the Feed Group.
63+
64+
await page
65+
.getByLabel('Block: Feedzy Loop')
66+
.locator('div')
67+
.nth(1)
68+
.click();
69+
await page.getByRole('button', { name: 'Edit Feed' }).click();
70+
71+
await page.getByRole('button', { name: 'Select Feed Group' }).click();
72+
await page.locator('.fz-dropdown-item').first().click();
73+
3974
await page
4075
.getByRole('button', { name: 'Load Feed', exact: true })
4176
.click();
4277
await page.waitForTimeout(1000);
4378

44-
await page.getByLabel('Display curated RSS content').click();
45-
4679
await page
4780
.getByRole('button', { name: 'Publish', exact: true })
4881
.click();

0 commit comments

Comments
 (0)