Fix logic around side solutions rhs

exercism · Oct 12, 2018 · c0f9fe3 · c0f9fe3
1 parent 922eeba
commit c0f9fe3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/app/views/my/solutions/_show_rhs.html.haml b/app/views/my/solutions/_show_rhs.html.haml
@@ -11,7 +11,7 @@
   -elsif @solution.approved? && [email protected]_approve?
     =render "show_approved"
 
-  -elsif @solution.exercise.side? && @solution.mentorships.count == 0
+  -elsif @solution.exercise.side? && @solution.mentorships.count == 0 && @solution.discussion_posts.count == 0 && [email protected]_approve?
     .finished-section
       .title-block
         %h3

diff --git a/test/system/my/side_exercises_test.rb b/test/system/my/side_exercises_test.rb
@@ -47,7 +47,7 @@ class My::SideExercisesTest < ApplicationSystemTestCase
 
   test "mentoring requested" do
     @solution.iterations.create
-    @solution.update(mentoring_requested_at_at: Time.current)
+    @solution.update(mentoring_requested_at: Time.current)
 
     visit my_track_path(@track)
     assert_selector ".pure-u-1-3 .widget-side-exercise.mentoring-requested"

diff --git a/test/system/my/solution_discussion_section_test.rb b/test/system/my/solution_discussion_section_test.rb
@@ -38,8 +38,8 @@ class My::SolutionDiscussionSectionTest < ApplicationSystemTestCase
     visit my_solution_path(solution)
 
     assert_selector ".finished-section .next-option strong", text: REQUEST_MENTORING_TEXT
+    assert_selector ".finished-section .next-option strong", text: COMPLETE_TEXT
     refute_selector ".finished-section .next-option strong", text: PUBLISH_TEXT
-    refute_selector ".finished-section .next-option strong", text: COMPLETE_TEXT
 
     refute_selector ".discussion"
   end
@@ -57,7 +57,9 @@ class My::SolutionDiscussionSectionTest < ApplicationSystemTestCase
     assert_selector ".next-steps"
     assert_selector ".next-steps a", text: "other people have solved this"
 
-    refute_selector ".finished-section"
+    refute_selector ".finished-section .next-option strong", text: REQUEST_MENTORING_TEXT
+    refute_selector ".finished-section .next-option strong", text: COMPLETE_TEXT
+    refute_selector ".finished-section .next-option strong", text: PUBLISH_TEXT
   end
 
   test "mentored section with auto approve" do