aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
diff options
context:
space:
mode:
authorZachary Scott <e@zzak.io>2014-07-06 11:41:31 -0700
committerZachary Scott <e@zzak.io>2014-07-06 11:41:31 -0700
commit2cda0aff3051bd84c5f3596174cf4d7f1999050a (patch)
treed51d9c251182ade892991a169f049ee38b741288 /actionview
parentfaf7e39744ee1adf0e581ed0278234173c5bd771 (diff)
parentddad32978d480235c7b01ae42edc667b45a396cb (diff)
downloadrails-2cda0aff3051bd84c5f3596174cf4d7f1999050a.tar.gz
rails-2cda0aff3051bd84c5f3596174cf4d7f1999050a.tar.bz2
rails-2cda0aff3051bd84c5f3596174cf4d7f1999050a.zip
Merge pull request #16057 from akshay-vishnoi/doc_change
[ci skip] /sqlite/i --> SQLite
Diffstat (limited to 'actionview')
-rw-r--r--actionview/RUNNING_UNIT_TESTS.rdoc4
-rw-r--r--actionview/test/active_record_unit.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/actionview/RUNNING_UNIT_TESTS.rdoc b/actionview/RUNNING_UNIT_TESTS.rdoc
index c408882827..6c4e5e983a 100644
--- a/actionview/RUNNING_UNIT_TESTS.rdoc
+++ b/actionview/RUNNING_UNIT_TESTS.rdoc
@@ -19,8 +19,8 @@ which can be further narrowed down to one test:
== Dependency on Active Record and database setup
Test cases in the test/activerecord/ directory depend on having
-activerecord and sqlite installed. If Active Record is not in
-actionview/../activerecord directory, or the sqlite rubygem is not installed,
+activerecord and sqlite3 installed. If Active Record is not in
+actionview/../activerecord directory, or the sqlite3 rubygem is not installed,
these tests are skipped.
Other tests are runnable from a fresh copy of actionview without any configuration.
diff --git a/actionview/test/active_record_unit.rb b/actionview/test/active_record_unit.rb
index 95fbb112c0..5b458d9394 100644
--- a/actionview/test/active_record_unit.rb
+++ b/actionview/test/active_record_unit.rb
@@ -57,7 +57,7 @@ class ActiveRecordTestConnector
end
end
- # Load actionpack sqlite tables
+ # Load actionpack SQLite tables
def load_schema
File.read(File.dirname(__FILE__) + "/fixtures/db_definitions/sqlite.sql").split(';').each do |sql|
ActiveRecord::Base.connection.execute(sql) unless sql.blank?