diff --git a/e2e/cypress/integration/navigation.spec.js b/e2e/cypress/integration/navigation.spec.js index b1b5a012b..674ee8473 100644 --- a/e2e/cypress/integration/navigation.spec.js +++ b/e2e/cypress/integration/navigation.spec.js @@ -27,7 +27,7 @@ describe('Routes & navigation', () => { it('can navigate to the News & Announcments page', () => { cy.visit('/news-announcements') cy.injectAxe() - cy.contains('All USSF news') + cy.contains('Latest external USSF news') cy.checkA11y(null, null, logging, { skipFailures: true }) }) diff --git a/e2e/cypress/integration/news.spec.js b/e2e/cypress/integration/news.spec.js index 13494cfea..28abffe7c 100644 --- a/e2e/cypress/integration/news.spec.js +++ b/e2e/cypress/integration/news.spec.js @@ -9,7 +9,7 @@ describe('News and Announcements', () => { cy.preserveLoginCookies() cy.intercept( - 'https://www.spaceforce.mil/DesktopModules/ArticleCS/RSS.ashx?ContentType=1&Site=1060&max=12' + 'https://www.spaceforce.mil/DesktopModules/ArticleCS/RSS.ashx?ContentType=1&Site=1060&max=4' ).as('getNewsRSS') cy.intercept( diff --git a/src/__tests__/pages/news-announcements.test.tsx b/src/__tests__/pages/news-announcements.test.tsx index 28c62d80a..ad1b80442 100644 --- a/src/__tests__/pages/news-announcements.test.tsx +++ b/src/__tests__/pages/news-announcements.test.tsx @@ -100,9 +100,10 @@ describe('News page', () => { // so a length of 2 is accurate expect(screen.getAllByText('Test Announcement')).toHaveLength(2) - expect(screen.getByText('All USSF news')).toBeInTheDocument() + expect(screen.getByText('Latest external USSF news')).toBeInTheDocument() - expect(await screen.findAllByRole('article')).toHaveLength(10) + const allArticles = await screen.findAllByRole('article') + expect(allArticles[0]).toContainHTML('article') }) }) }) diff --git a/src/pages/news-announcements.tsx b/src/pages/news-announcements.tsx index 50aea884c..3383087a4 100644 --- a/src/pages/news-announcements.tsx +++ b/src/pages/news-announcements.tsx @@ -24,7 +24,7 @@ import { GET_INTERNAL_NEWS_CAROUSEL_ARTICLES } from 'operations/cms/queries/getI import { SPACEFORCE_NEWS_RSS_URL } from 'constants/index' import { ArticleList } from 'components/ArticleList/ArticleList' -const RSS_URL = `${SPACEFORCE_NEWS_RSS_URL}&max=12` +const RSS_URL = `${SPACEFORCE_NEWS_RSS_URL}&max=4` const NewsAnnouncements = ({ announcements, @@ -73,10 +73,9 @@ const NewsAnnouncements = ({ )}
-

All USSF news

+

Latest external USSF news

- Publically and internally released Space Force news, published within - the last 30 days. + Publically released Space Force news released within the last 30 days.

@@ -93,13 +92,13 @@ const NewsAnnouncements = ({ formatToArticleListItem(item as Required) )} /> -
+
- Read more news + View older Spaceforce.mil articles
@@ -113,14 +112,14 @@ export default NewsAnnouncements NewsAnnouncements.getLayout = (page: React.ReactNode) => withPageLayout(
-

News

+

News & Announcements

asCustom={NavLink} href="/"> Service portal home - News + News & Announcements
, page