From 279fef1f9fedf73d94fc09e34566b1c56ec04a4c Mon Sep 17 00:00:00 2001
From: Marcelo Silveira <marcelo@mhfs.com.br>
Date: Wed, 2 May 2012 23:57:27 -0300
Subject: Rename test file so that the test suite matches it, implement
 `persisted?` for SqlBypass as expected by tests and convert session_id to
 string before using on queries to get correct quotes on postgresql (avoid
 casting error).

---
 .../test/cases/session_store/sql_bypass.rb         | 56 --------------------
 .../test/cases/session_store/sql_bypass_test.rb    | 61 ++++++++++++++++++++++
 2 files changed, 61 insertions(+), 56 deletions(-)
 delete mode 100644 activerecord/test/cases/session_store/sql_bypass.rb
 create mode 100644 activerecord/test/cases/session_store/sql_bypass_test.rb

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/session_store/sql_bypass.rb b/activerecord/test/cases/session_store/sql_bypass.rb
deleted file mode 100644
index 7402b2afd6..0000000000
--- a/activerecord/test/cases/session_store/sql_bypass.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require 'cases/helper'
-require 'action_dispatch'
-require 'active_record/session_store'
-
-module ActiveRecord
-  class SessionStore
-    class SqlBypassTest < ActiveRecord::TestCase
-      def setup
-        super
-        Session.drop_table! if Session.table_exists?
-      end
-
-      def test_create_table
-        assert !Session.table_exists?
-        SqlBypass.create_table!
-        assert Session.table_exists?
-        SqlBypass.drop_table!
-        assert !Session.table_exists?
-      end
-
-      def test_persisted?
-        s = SqlBypass.new :data => 'foo', :session_id => 10
-        assert !s.persisted?, 'this is a new record!'
-      end
-
-      def test_not_loaded?
-        s = SqlBypass.new({})
-        assert !s.loaded?, 'it is not loaded'
-      end
-
-      def test_loaded?
-        s = SqlBypass.new :data => 'hello'
-        assert s.loaded?, 'it is loaded'
-      end
-
-      def test_save
-        SqlBypass.create_table! unless Session.table_exists?
-        session_id = 20
-        s = SqlBypass.new :data => 'hello', :session_id => session_id
-        s.save
-        t = SqlBypass.find_by_session_id session_id
-        assert_equal s.session_id, t.session_id
-        assert_equal s.data, t.data
-      end
-
-      def test_destroy
-        SqlBypass.create_table! unless Session.table_exists?
-        session_id = 20
-        s = SqlBypass.new :data => 'hello', :session_id => session_id
-        s.save
-        s.destroy
-        assert_nil SqlBypass.find_by_session_id session_id
-      end
-    end
-  end
-end
diff --git a/activerecord/test/cases/session_store/sql_bypass_test.rb b/activerecord/test/cases/session_store/sql_bypass_test.rb
new file mode 100644
index 0000000000..6749d4ce98
--- /dev/null
+++ b/activerecord/test/cases/session_store/sql_bypass_test.rb
@@ -0,0 +1,61 @@
+require 'cases/helper'
+require 'action_dispatch'
+require 'active_record/session_store'
+
+module ActiveRecord
+  class SessionStore
+    class SqlBypassTest < ActiveRecord::TestCase
+      def setup
+        super
+        Session.drop_table! if Session.table_exists?
+      end
+
+      def test_create_table
+        assert !Session.table_exists?
+        SqlBypass.create_table!
+        assert Session.table_exists?
+        SqlBypass.drop_table!
+        assert !Session.table_exists?
+      end
+
+      def test_new_record?
+        s = SqlBypass.new :data => 'foo', :session_id => 10
+        assert s.new_record?, 'this is a new record!'
+      end
+
+      def test_persisted?
+        s = SqlBypass.new :data => 'foo', :session_id => 10
+        assert !s.persisted?, 'this is a new record!'
+      end
+
+      def test_not_loaded?
+        s = SqlBypass.new({})
+        assert !s.loaded?, 'it is not loaded'
+      end
+
+      def test_loaded?
+        s = SqlBypass.new :data => 'hello'
+        assert s.loaded?, 'it is loaded'
+      end
+
+      def test_save
+        SqlBypass.create_table! unless Session.table_exists?
+        session_id = 20
+        s = SqlBypass.new :data => 'hello', :session_id => session_id
+        s.save
+        t = SqlBypass.find_by_session_id session_id
+        assert_equal s.session_id, t.session_id
+        assert_equal s.data, t.data
+      end
+
+      def test_destroy
+        SqlBypass.create_table! unless Session.table_exists?
+        session_id = 20
+        s = SqlBypass.new :data => 'hello', :session_id => session_id
+        s.save
+        s.destroy
+        assert_nil SqlBypass.find_by_session_id session_id
+      end
+    end
+  end
+end
-- 
cgit v1.2.3