refact: fix tests after contextual job page changes

hashicorp · Jan 26, 2022 · 6c65966 · 6c65966
1 parent c1bb21d
commit 6c65966
Show file tree

Hide file tree

Showing 13 changed files with 453 additions and 295 deletions.
diff --git a/ui/app/routes/jobs/job/index.js b/ui/app/routes/jobs/job/index.js
@@ -32,7 +32,9 @@ export default class IndexRoute extends Route.extend(WithWatchers) {
         model.get('hasChildren') &&
         this.watchAllJobs.perform({ namespace: model.namespace.get('name') }),
       nodes:
-        model.get('hasClientStatus') && this.can.can('read client') && this.watchNodes.perform(),
+        model.get('hasClientStatus') &&
+        this.can.can('read client') &&
+        this.watchNodes.perform(),
     });
   }
 

diff --git a/ui/app/templates/components/job-page/parts/job-client-status-summary.hbs b/ui/app/templates/components/job-page/parts/job-client-status-summary.hbs
@@ -1,6 +1,6 @@
 {{#if this.job.hasClientStatus}}
   <ListAccordion
-    data-test-job-summary
+    data-test-job-client-summary
     @source={{array this.job}}
     @key="id"
     @startExpanded={{this.isExpanded}}

diff --git a/ui/app/templates/components/job-page/parts/summary.hbs b/ui/app/templates/components/job-page/parts/summary.hbs
@@ -5,7 +5,10 @@
   @startExpanded={{this.isExpanded}}
   @onToggle={{action this.persist}} as |a|
 >
-  <a.head @buttonLabel={{if a.isOpen "collapse" "expand"}}>
+  <a.head
+    @buttonLabel={{if a.isOpen "collapse" "expand"}}
+    @buttonType={{if a.item.hasChildren "children-status" "allocation-status"}}
+  >
     <div class="columns">
       <div class="column is-minimum nowrap">
         {{#if a.item.hasChildren}}
@@ -32,7 +35,10 @@
                 </em>
               {{/if}}
             {{else}}
-              <AllocationStatusBar @allocationContainer={{a.item}} @isNarrow={{true}} />
+              <AllocationStatusBar
+                @allocationContainer={{a.item}}
+                @isNarrow={{true}}
+              />
             {{/if}}
           </div>
         </div>
@@ -55,7 +61,10 @@
 
                 {{if (eq datum.value 0) "is-empty"}}"
             >
-              <JobPage::Parts::SummaryLegendItem @datum={{datum}} @index={{index}} />
+              <JobPage::Parts::SummaryLegendItem
+                @datum={{datum}}
+                @index={{index}}
+              />
             </li>
           {{/each}}
         </ol>
@@ -83,10 +92,16 @@
                   @model={{this.job}}
                   @query={{datum.legendLink.queryParams}}
                 >
-                  <JobPage::Parts::SummaryLegendItem @datum={{datum}} @index={{index}} />
+                  <JobPage::Parts::SummaryLegendItem
+                    @datum={{datum}}
+                    @index={{index}}
+                  />
                 </LinkTo>
               {{else}}
-                <JobPage::Parts::SummaryLegendItem @datum={{datum}} @index={{index}} />
+                <JobPage::Parts::SummaryLegendItem
+                  @datum={{datum}}
+                  @index={{index}}
+                />
               {{/if}}
             </li>
           {{/each}}

diff --git a/ui/app/templates/components/job-subnav.hbs b/ui/app/templates/components/job-subnav.hbs
@@ -31,7 +31,7 @@
         Versions
       </LinkTo>
     </li>
-    {{#if this.job.supportsDeployments}}
+    {{#if @job.supportsDeployments}}
       <li data-test-tab="deployments">
         <LinkTo
           @route="jobs.job.deployments"

diff --git a/ui/app/templates/components/list-accordion/accordion-head.hbs b/ui/app/templates/components/list-accordion/accordion-head.hbs
@@ -3,8 +3,11 @@
 </div>
 <button
   data-test-accordion-toggle
-  class="button is-light is-compact pull-right accordion-toggle {{unless this.isExpandable "is-invisible"}}"
+  data-test-accordion-summary-chart={{this.buttonType}}
+  class="button is-light is-compact pull-right accordion-toggle
+    {{unless this.isExpandable "is-invisible"}}"
   onclick={{action (if this.isOpen this.onClose this.onOpen) this.item}}
-  type="button">
+  type="button"
+>
   {{this.buttonLabel}}
-</button>
+</button>