fix maintenance test and move working area before settings so backlas…

…h/percission calibration will not be enabled
mrbeam · Oct 19, 2023 · 6e1761d · 6e1761d
1 parent 81706dd
commit 6e1761d
Show file tree

Hide file tree

Showing 20 changed files with 10 additions and 3 deletions.
diff --git a/...s/e2e/working area/design_functions.cy.js → ...2e/01_working_area/design_functions.cy.js b/...s/e2e/working area/design_functions.cy.js → ...2e/01_working_area/design_functions.cy.js
diff --git a/.../working area/designs/dxf_laser_job.cy.js → ..._working_area/designs/dxf_laser_job.cy.js b/.../working area/designs/dxf_laser_job.cy.js → ..._working_area/designs/dxf_laser_job.cy.js
diff --git a/.../working area/designs/jpg_laser_job.cy.js → ..._working_area/designs/jpg_laser_job.cy.js b/.../working area/designs/jpg_laser_job.cy.js → ..._working_area/designs/jpg_laser_job.cy.js
diff --git a/.../working area/designs/png_laser_job.cy.js → ..._working_area/designs/png_laser_job.cy.js b/.../working area/designs/png_laser_job.cy.js → ..._working_area/designs/png_laser_job.cy.js
diff --git a/...g area/designs/quick_text_laser_job.cy.js → ...g_area/designs/quick_text_laser_job.cy.js b/...g area/designs/quick_text_laser_job.cy.js → ...g_area/designs/quick_text_laser_job.cy.js
diff --git a/...ng area/designs/shapes/circle_shape.cy.js → ...ng_area/designs/shapes/circle_shape.cy.js b/...ng area/designs/shapes/circle_shape.cy.js → ...ng_area/designs/shapes/circle_shape.cy.js
diff --git a/...ing area/designs/shapes/heart_shape.cy.js → ...ing_area/designs/shapes/heart_shape.cy.js b/...ing area/designs/shapes/heart_shape.cy.js → ...ing_area/designs/shapes/heart_shape.cy.js
diff --git a/...king area/designs/shapes/line_shape.cy.js → ...king_area/designs/shapes/line_shape.cy.js b/...king area/designs/shapes/line_shape.cy.js → ...king_area/designs/shapes/line_shape.cy.js
diff --git a/...area/designs/shapes/rectangle_shape.cy.js → ...area/designs/shapes/rectangle_shape.cy.js b/...area/designs/shapes/rectangle_shape.cy.js → ...area/designs/shapes/rectangle_shape.cy.js
diff --git a/...king area/designs/shapes/star_shape.cy.js → ...king_area/designs/shapes/star_shape.cy.js b/...king area/designs/shapes/star_shape.cy.js → ...king_area/designs/shapes/star_shape.cy.js
diff --git a/.../working area/designs/svg_laser_job.cy.js → ..._working_area/designs/svg_laser_job.cy.js b/.../working area/designs/svg_laser_job.cy.js → ..._working_area/designs/svg_laser_job.cy.js
diff --git a/...rking area/designs/text/filled_text.cy.js → ...rking_area/designs/text/filled_text.cy.js b/...rking area/designs/text/filled_text.cy.js → ...rking_area/designs/text/filled_text.cy.js
diff --git a/...rking area/designs/text/stroke_text.cy.js → ...rking_area/designs/text/stroke_text.cy.js b/...rking area/designs/text/stroke_text.cy.js → ...rking_area/designs/text/stroke_text.cy.js
diff --git a/cypress/e2e/working area/left_side.cy.js → cypress/e2e/01_working_area/left_side.cy.js b/cypress/e2e/working area/left_side.cy.js → cypress/e2e/01_working_area/left_side.cy.js
diff --git a/cypress/e2e/working area/right_side.cy.js → cypress/e2e/01_working_area/right_side.cy.js b/cypress/e2e/working area/right_side.cy.js → cypress/e2e/01_working_area/right_side.cy.js
diff --git a/...e/working area/settings/cut_engrave.cy.js → ...1_working_area/settings/cut_engrave.cy.js b/...e/working area/settings/cut_engrave.cy.js → ...1_working_area/settings/cut_engrave.cy.js
diff --git a/...king area/settings/cut_skip_another.cy.js → ...king_area/settings/cut_skip_another.cy.js b/...king area/settings/cut_skip_another.cy.js → ...king_area/settings/cut_skip_another.cy.js
diff --git a/...ng area/settings/material_selection.cy.js → ...ng_area/settings/material_selection.cy.js b/...ng area/settings/material_selection.cy.js → ...ng_area/settings/material_selection.cy.js
diff --git a/cypress/e2e/settings/maintenance.cy.js b/cypress/e2e/settings/maintenance.cy.js
@@ -37,6 +37,13 @@ describe("Maintenance", function () {
                     expect(resp.status).to.eq(200);
                 });
             });
+        cy.get('[data-test="maintenance-links-buy-now-heavy-duty-pre-filter"]')
+            .invoke("attr", "href")
+            .then((myLink) => {
+                cy.request(myLink).then((resp) => {
+                    expect(resp.status).to.eq(200);
+                });
+            });
     });
     // status code no exist
     it("Air Filter: Main-filter", function () {

diff --git a/octoprint_mrbeam/templates/settings/maintenance_settings.jinja2 b/octoprint_mrbeam/templates/settings/maintenance_settings.jinja2
@@ -16,7 +16,7 @@
                     </div>
                     <div class="maintenance-links" data-bind="visible: shopifyLink('prefilter', 0)">
                         <a data-bind="attr: {href: shopifyLink('prefilter', 0)}"
-                           target="_blank" id="prefilter_shop_link" data-test="maintenance-links-buy-now-pre-filter" class="maintenance-link-shop">
+                           target="_blank" id="prefilter_shop_link" data-test="maintenance-links-buy-new-pre-filter-af3" class="maintenance-link-shop">
                             <i class="icon-shopping-cart"></i>
                             {{ _('Buy now') }}
                         </a>
@@ -45,7 +45,7 @@
                     </div>
                     <div class="maintenance-links" data-bind="visible: shopifyLink('carbonfilter', 0)">
                         <a data-bind="attr: {href: shopifyLink('carbonfilter', 0)}"
-                           target="_blank" id="carbon_filter_shop_link" class="maintenance-link-shop">
+                           target="_blank" id="carbon_filter_shop_link" data-test="maintenance-links-buy-now-main-filter-af3" class="maintenance-link-shop">
                             <i class="icon-shopping-cart"></i>
                             {{ _('Buy now') }}
                         </a>
@@ -101,7 +101,7 @@
                                 </small>
                                 <div class="maintenance-links" data-bind="visible: shopifyLink('prefilter_heavy_duty', 0)">
                                     <a data-bind="attr: {href: shopifyLink('prefilter_heavy_duty', 0)}"
-                                       target="_blank" id="prefilter_shop_link" data-test="maintenance-links-buy-now-pre-filter" class="maintenance-link-shop">
+                                       target="_blank" id="prefilter_shop_link" data-test="maintenance-links-buy-now-heavy-duty-pre-filter" class="maintenance-link-shop">
                                         <i class="icon-shopping-cart"></i>
                                         {{ _('Buy now') }}
                                     </a>