From f3e7bb600994068793db021518f9daf053ce5b2b Mon Sep 17 00:00:00 2001 From: Samantha Goodman Date: Tue, 24 May 2022 16:52:50 -0400 Subject: [PATCH 1/5] update html text to match design file --- index.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index a48d8e5..4f7f1a7 100644 --- a/index.html +++ b/index.html @@ -16,7 +16,7 @@ About Cookies - Celebrations + Weddings Catering Contact @@ -32,20 +32,20 @@ - Cookies + Cupcakes Cookie soufflé dessert carrot cake fruitcake halvah pudding cake. Marzipan topping bear claw soufflé gingerbread biscuit. Tiramisu gummi bears chocolate bar sugar plum icing muffin cake jelly-o icing. - Celebrations + Cookies Candy apple pie lemon drops sweet roll danish. Tiramisu candy canes jelly-o jelly beans cotton candy pastry pudding tootsie roll carrot cake. Dessert sesame snaps brownie lemon drops cookie donut dragée. Toffee pie fruitcake powder gingerbread pudding. - Catering + Celebrations Sweet jelly-o apple pie powder jelly beans. Pastry sweet roll cake jujubes halvah soufflé brownie. Toffee cookie lemondrops jelly beans chocolate bar. Wafer muffin jujubes danish tart danish chocolate wafer. @@ -62,7 +62,7 @@ About Cookies - Celebrations + Weddings Catering Contact From dae79549cdfa4a056573796d04db15cfa6d6d514 Mon Sep 17 00:00:00 2001 From: Samantha Goodman Date: Tue, 24 May 2022 16:54:24 -0400 Subject: [PATCH 2/5] update image comment placement --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 4f7f1a7..b8f1a9b 100644 --- a/index.html +++ b/index.html @@ -31,13 +31,13 @@ - + Cupcakes Cookie soufflé dessert carrot cake fruitcake halvah pudding cake. Marzipan topping bear claw soufflé gingerbread biscuit. Tiramisu gummi bears chocolate bar sugar plum icing muffin cake jelly-o icing. - + Cookies Candy apple pie lemon drops sweet roll danish. Tiramisu candy canes jelly-o jelly beans cotton candy pastry pudding From 14380951060db59b6e77c515e6488829fc340ed2 Mon Sep 17 00:00:00 2001 From: Samantha Goodman Date: Tue, 24 May 2022 17:08:06 -0400 Subject: [PATCH 3/5] update tests to match new text values --- codegrade_mvp.test.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/codegrade_mvp.test.js b/codegrade_mvp.test.js index 2624bae..1e81a6c 100644 --- a/codegrade_mvp.test.js +++ b/codegrade_mvp.test.js @@ -40,7 +40,7 @@ describe('index.html', () => { expect(headerNavLinks[0].innerHTML).toMatch(/About/i); expect(headerNavLinks[1].innerHTML).toMatch(/Cookies/i); - expect(headerNavLinks[2].innerHTML).toMatch(/Celebrations/i); + expect(headerNavLinks[2].innerHTML).toMatch(/Weddings/i); expect(headerNavLinks[3].innerHTML).toMatch(/Catering/i); expect(headerNavLinks[4].innerHTML).toMatch(/Contact/i); }); @@ -50,7 +50,7 @@ describe('index.html', () => { expect(headerNavLinks[0].href.includes('#about')).toEqual(true); expect(headerNavLinks[1].href.includes('#cookies')).toEqual(true); - expect(headerNavLinks[2].href.includes('#celebrations')).toEqual(true); + expect(headerNavLinks[2].href.includes('#weddings')).toEqual(true); expect(headerNavLinks[3].href.includes('#catering')).toEqual(true); expect(headerNavLinks[4].href.includes('#contact')).toEqual(true); }); @@ -61,16 +61,16 @@ describe('index.html', () => { expect(getByText(h2Arr[0], /About Sweet Eats Bakery/i)).toBeInTheDocument(); expect(getByText(h2Arr[1], /Cookies/i)).toBeInTheDocument(); - expect(getByText(h2Arr[2], /Celebrations/i)).toBeInTheDocument(); + expect(getByText(h2Arr[2], /Weddings/i)).toBeInTheDocument(); expect(getByText(h2Arr[3], /Catering/i)).toBeInTheDocument(); - expect(getByText(h2Arr[4], /Contact Us/i)).toBeInTheDocument(); + expect(getByText(h2Arr[4], /Contact/i)).toBeInTheDocument(); }); it('renders the correct four images in body', () => { const expectedImgSrcsArr = [ "https://tk-assets.lambdaschool.com/bcf76f62-2431-4c22-b466-2e711f3da2b9_ui-i-bakery-main-header.png", + "https://tk-assets.lambdaschool.com/7393a8fd-c8e5-4003-921f-79e0d546d02c_ui-i-bakery-cookies.png", "https://tk-assets.lambdaschool.com/297378d6-9c89-430f-9d2e-46ae3d5edce8_ui-i-bakery-cupcake-i.png", - "https://tk-assets.lambdaschool.com/7393a8fd-c8e5-4003-921f-79e0d546d02c_ui-i-bakery-cookies.png", "https://tk-assets.lambdaschool.com/ab0cb095-5900-476c-b042-aea065d3dbbf_ui-i-bakery-celebrate.png" ]; const allImages = Array.from(container.querySelectorAll('img')); @@ -106,7 +106,7 @@ describe('index.html', () => { expect(footerNavLinks[0].innerHTML).toMatch(/About/i); expect(footerNavLinks[1].innerHTML).toMatch(/Cookies/i); - expect(footerNavLinks[2].innerHTML).toMatch(/Celebrations/i); + expect(footerNavLinks[2].innerHTML).toMatch(/Weddings/i); expect(footerNavLinks[3].innerHTML).toMatch(/Catering/i); expect(footerNavLinks[4].innerHTML).toMatch(/Contact/i); }); @@ -116,7 +116,7 @@ describe('index.html', () => { expect(footerNavLinks[0].href.includes('#about')).toEqual(true); expect(footerNavLinks[1].href.includes('#cookies')).toEqual(true); - expect(footerNavLinks[2].href.includes('#celebrations')).toEqual(true); + expect(footerNavLinks[2].href.includes('#weddings')).toEqual(true); expect(footerNavLinks[3].href.includes('#catering')).toEqual(true); expect(footerNavLinks[4].href.includes('#contact')).toEqual(true); }); From 02ddaeedc4e6c8b6358e966b3993a6d2763f8baa Mon Sep 17 00:00:00 2001 From: Samantha Goodman Date: Tue, 24 May 2022 17:15:18 -0400 Subject: [PATCH 4/5] update external stylesheet test --- codegrade_mvp.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codegrade_mvp.test.js b/codegrade_mvp.test.js index 1e81a6c..adb2393 100644 --- a/codegrade_mvp.test.js +++ b/codegrade_mvp.test.js @@ -24,7 +24,7 @@ describe('index.html', () => { }); it('renders with an external stylesheet', () => { - const cssLinkTag = dom.window.document.head.querySelector('link[rel="stylesheet"]'); + const cssLinkTag = dom.window.document.head.querySelector('link[href="index.css"]'); expect(cssLinkTag).toBeInTheDocument(); }); From f690f2bc42c7d7bf0f6c9f5fb444c25b7024fc0d Mon Sep 17 00:00:00 2001 From: Samantha Goodman Date: Tue, 24 May 2022 17:35:17 -0400 Subject: [PATCH 5/5] update h2 test --- codegrade_mvp.test.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/codegrade_mvp.test.js b/codegrade_mvp.test.js index adb2393..bab4237 100644 --- a/codegrade_mvp.test.js +++ b/codegrade_mvp.test.js @@ -60,10 +60,10 @@ describe('index.html', () => { expect(h2Arr.length).toBe(5); expect(getByText(h2Arr[0], /About Sweet Eats Bakery/i)).toBeInTheDocument(); - expect(getByText(h2Arr[1], /Cookies/i)).toBeInTheDocument(); - expect(getByText(h2Arr[2], /Weddings/i)).toBeInTheDocument(); - expect(getByText(h2Arr[3], /Catering/i)).toBeInTheDocument(); - expect(getByText(h2Arr[4], /Contact/i)).toBeInTheDocument(); + expect(getByText(h2Arr[1], /Cupcakes/i)).toBeInTheDocument(); + expect(getByText(h2Arr[2], /Cookies/i)).toBeInTheDocument(); + expect(getByText(h2Arr[3], /Celebrations/i)).toBeInTheDocument(); + expect(getByText(h2Arr[4], /Contact Us/i)).toBeInTheDocument(); }); it('renders the correct four images in body', () => {