3 files changed, 48 insertions, 2 deletions
diff --git a/activerecord/test/cases/arel/nodes/node_test.rb b/activerecord/test/cases/arel/nodes/node_test.rb
index f1e0ce1ea9..8a9ecd84ca 100644
--- a/activerecord/test/cases/arel/nodes/node_test.rb
+++ b/activerecord/test/cases/arel/nodes/node_test.rb
@@ -14,7 +14,7 @@ module Arel
       }.grep(Class).each do |klass|
         next if Nodes::SqlLiteral == klass
         next if Nodes::BindParam == klass
-        next if klass.name =~ /^Arel::Nodes::(?:Test|.*Test$)/
+        next if /^Arel::Nodes::(?:Test|.*Test$)/.match?(klass.name)
         assert klass.ancestors.include?(Nodes::Node), klass.name
       end
     end
diff --git a/activerecord/test/cases/arel/select_manager_test.rb b/activerecord/test/cases/arel/select_manager_test.rb
index 526fe6787a..4512d8e8a6 100644
--- a/activerecord/test/cases/arel/select_manager_test.rb
+++ b/activerecord/test/cases/arel/select_manager_test.rb
@@ -514,7 +514,7 @@ module Arel
       assert_equal "bar", join.right
     end
 
-    it "should create join nodes with a outer join klass" do
+    it "should create join nodes with an outer join klass" do
       relation = Arel::SelectManager.new
       join = relation.create_join "foo", "bar", Arel::Nodes::OuterJoin
       assert_kind_of Arel::Nodes::OuterJoin, join
diff --git a/activerecord/test/cases/arel/visitors/mysql_test.rb b/activerecord/test/cases/arel/visitors/mysql_test.rb
index 5f37587957..05dccd126e 100644
--- a/activerecord/test/cases/arel/visitors/mysql_test.rb
+++ b/activerecord/test/cases/arel/visitors/mysql_test.rb
@@ -104,6 +104,52 @@ module Arel
           sql.must_be_like %{ NOT "users"."name" <=> NULL }
         end
       end
+
+      describe "Nodes::Regexp" do
+        before do
+          @table = Table.new(:users)
+          @attr = @table[:id]
+        end
+
+        it "should know how to visit" do
+          node = @table[:name].matches_regexp("foo.*")
+          node.must_be_kind_of Nodes::Regexp
+          compile(node).must_be_like %{
+            "users"."name" REGEXP 'foo.*'
+          }
+        end
+
+        it "can handle subqueries" do
+          subquery = @table.project(:id).where(@table[:name].matches_regexp("foo.*"))
+          node = @attr.in subquery
+          compile(node).must_be_like %{
+            "users"."id" IN (SELECT id FROM "users" WHERE "users"."name" REGEXP 'foo.*')
+          }
+        end
+      end
+
+      describe "Nodes::NotRegexp" do
+        before do
+          @table = Table.new(:users)
+          @attr = @table[:id]
+        end
+
+        it "should know how to visit" do
+          node = @table[:name].does_not_match_regexp("foo.*")
+          node.must_be_kind_of Nodes::NotRegexp
+          compile(node).must_be_like %{
+            "users"."name" NOT REGEXP 'foo.*'
+          }
+        end
+
+        it "can handle subqueries" do
+          subquery = @table.project(:id).where(@table[:name].does_not_match_regexp("foo.*"))
+          node = @attr.in subquery
+          compile(node).must_be_like %{
+            "users"."id" IN (SELECT id FROM "users" WHERE "users"."name" NOT REGEXP 'foo.*')
+          }
+        end
+      end
     end
   end
 end