refactor: move test changes to end

Author: jlp-craigmorten

src/__tests__/__snapshots__/role-helpers.js.snap

@@ -44,32 +44,6 @@ Name "Tertiary Heading":
   data-testid="a-h3"
 />
 
---------------------------------------------------
-img:
-
-Name "":
-<img
-  data-testid="a-img-1"
-  src="http://example.com/image.png"
-/>
-
-Name "a meaningful description":
-<img
-  alt="a meaningful description"
-  data-testid="a-img-3"
-  src="http://example.com/image.png"
-/>
-
---------------------------------------------------
-presentation:
-
-Name "":
-<img
-  alt=""
-  data-testid="a-img-2"
-  src="http://example.com/image.png"
-/>
-
 --------------------------------------------------
 article:
 
@@ -216,5 +190,31 @@ Name "":
   data-testid="a-dd"
 />
 
+--------------------------------------------------
+img:
+
+Name "":
+<img
+  data-testid="a-img-1"
+  src="http://example.com/image.png"
+/>
+
+Name "a meaningful description":
+<img
+  alt="a meaningful description"
+  data-testid="a-img-3"
+  src="http://example.com/image.png"
+/>
+
+--------------------------------------------------
+presentation:
+
+Name "":
+<img
+  alt=""
+  data-testid="a-img-2"
+  src="http://example.com/image.png"
+/>
+
 --------------------------------------------------
 `;

src/__tests__/role-helpers.js

@@ -27,10 +27,6 @@ function setup() {
   <h2 data-testid='a-h2'>Sub Heading</h2>
   <h3 data-testid='a-h3'>Tertiary Heading</h3>
 
-  <img src="http://example.com/image.png" data-testid='a-img-1'/>
-  <img alt="" src="http://example.com/image.png" data-testid='a-img-2'/>
-  <img alt="a meaningful description" src="http://example.com/image.png" data-testid='a-img-3'/>
-
   <article data-testid='a-article'>
     <ul data-testid='a-list'>
       <li data-testid='a-list-item-1'>Item 1</li>
@@ -62,25 +58,25 @@ function setup() {
 
     <form data-testid="a-form" />
     <section data-testid="a-section" />
-   </article>
-   <dl>
+  </article>
+  <dl>
     <dt data-testid="a-dt">Term</dt>
     <dd data-testid="a-dd">Definition</dd>
-   </dl>
+  </dl>
+
+  <img src="http://example.com/image.png" data-testid='a-img-1'/>
+  <img alt="" src="http://example.com/image.png" data-testid='a-img-2'/>
+  <img alt="a meaningful description" src="http://example.com/image.png" data-testid='a-img-3'/>
 </section>
   `)
 
   return {
     unnamedSection: getByTestId('a-section'),
     namedSection: getByTestId('named-section'),
     anchor: getByTestId('a-link'),
-    invalidAnchor: getByTestId('invalid-link'),
     h1: getByTestId('a-h1'),
     h2: getByTestId('a-h2'),
     h3: getByTestId('a-h3'),
-    unnamedImg: getByTestId('a-img-1'),
-    presentationImg: getByTestId('a-img-2'),
-    namedImg: getByTestId('a-img-3'),
     nav: getByTestId('a-nav'),
     article: getByTestId('a-article'),
     aUl: getByTestId('a-list'),
@@ -105,20 +101,19 @@ function setup() {
     dt: getByTestId('a-dt'),
     dd: getByTestId('a-dd'),
     header: getByTestId('a-header'),
+    invalidAnchor: getByTestId('invalid-link'),
+    unnamedImg: getByTestId('a-img-1'),
+    presentationImg: getByTestId('a-img-2'),
+    namedImg: getByTestId('a-img-3'),
   }
 }
 
 test('getRoles returns expected roles for various dom nodes', () => {
   const {
-    unnamedSection,
     anchor,
-    invalidAnchor,
     h1,
     h2,
     h3,
-    unnamedImg,
-    presentationImg,
-    namedImg,
     nav,
     article,
     aUl,
@@ -143,13 +138,16 @@ test('getRoles returns expected roles for various dom nodes', () => {
     dd,
     dt,
     header,
+    invalidAnchor,
+    unnamedSection,
+    unnamedImg,
+    presentationImg,
+    namedImg,
   } = setup()
 
   expect(getRoles(namedSection)).toEqual({
     link: [anchor],
-    generic: [invalidAnchor, unnamedSection],
     heading: [h1, h2, h3],
-    img: [unnamedImg, namedImg],
     navigation: [nav],
     radio: [radio, radio2],
     article: [article],
@@ -164,6 +162,8 @@ test('getRoles returns expected roles for various dom nodes', () => {
     region: [namedSection],
     term: [dt],
     definition: [dd],
+    generic: [invalidAnchor, unnamedSection],
+    img: [unnamedImg, namedImg],
     presentation: [presentationImg],
   })
   expect(getRoles(header)).toEqual({