Merge branch 'dev' into redesign/profile-page

MaMpf-HD · Dec 3, 2024 · 9904350 · 9904350
2 parents adad4a7 + 8196e38
commit 9904350
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/models/lesson.rb b/app/models/lesson.rb
@@ -286,7 +286,7 @@ def probable_start_destination
   end
 
   def tags_without_section
-    tags.includes(:sections).select { |t| (t.sections & sections).empty? }
+    tags.includes(:sections).select { |t| (t.sections & sections).empty? } # rubocop:disable Style/ArrayIntersect
   end
 
   private

diff --git a/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js b/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
@@ -117,7 +117,7 @@ export function logoutAndLoginAsTeacher(context) {
 
 export function verifyNoTutorialsButUserEligibleAsTutor(context, shouldBeEligible = true) {
   cy.getBySelector("tutorial-row").should("not.exist");
-  cy.getBySelector("new-tutorial-btn").click();
+  cy.getBySelector("new-tutorial-btn").should("be.visible").click();
   cy.then(() => {
     cy.getBySelector("tutorial-form").should("be.visible");
     cy.getBySelector("tutor-select").within(() => {
-Original file line number
+Diff line change
@@ Expand Up / @@ -286,7 +286,7 @@ def probable_start_destination @@
       end
       def tags_without_section
-        tags.includes(:sections).select { |t| (t.sections & sections).empty? }
+        tags.includes(:sections).select { |t| (t.sections & sections).empty? } # rubocop:disable Style/ArrayIntersect
       end
       private
@@ Expand Down @@