Moviegoer and SimpleCalculator accept exceptions from both scopes

The tests for these two learning exercises now check whether the expected exception has been defined inside or outside the main class. Solves issue #6772

Author: VaiaPatta1985

exercises/concept/moviegoer/moviegoer_test.rb

@@ -23,7 +23,8 @@ def test_members_get_free_popcorn
   end
 
   def test_regular_moviegoers_dont_get_free_popcorn
-    assert_raises NotMovieClubMemberError do
+    expected_exception=Moviegoer.include?(NotMovieClubMemberError)?(Moviegoer::NotMovieClubMemberError):NotMovieClubMemberError
+    assert_raises expected_exception do
       Moviegoer.new(25, member: false).claim_free_popcorn!
     end
   end

exercises/concept/simple-calculator/simple_calculator_test.rb

@@ -27,14 +27,17 @@ def test_no_number_second_operand_raises_exception
   end
 
   def test_raises_exception_for_non_valid_operations
-    assert_raises(SimpleCalculator::UnsupportedOperation) { SimpleCalculator.calculate(1, 2, '**') }
+    expected_exception=SimpleCalculator.include?(UnsupportedOperation)?(SimpleCalculator::UnsupportedOperation):UnsupportedOperation
+    assert_raises(expected_exception) { SimpleCalculator.calculate(1, 2, '**') }
   end
 
   def test_raises_exception_when_operation_is_nil
-    assert_raises(SimpleCalculator::UnsupportedOperation) { SimpleCalculator.calculate(1, 2, nil) }
+    expected_exception=SimpleCalculator.include?(UnsupportedOperation)?(SimpleCalculator::UnsupportedOperation):UnsupportedOperation
+    assert_raises(expected_exception) { SimpleCalculator.calculate(1, 2, nil) }
   end
 
   def test_raises_exception_when_operation_is_an_empty_string
-    assert_raises(SimpleCalculator::UnsupportedOperation) { SimpleCalculator.calculate(1, 2, '') }
+    expected_exception=SimpleCalculator.include?(UnsupportedOperation)?(SimpleCalculator::UnsupportedOperation):UnsupportedOperation
+    assert_raises(expected_exception) { SimpleCalculator.calculate(1, 2, '') }
   end
 end