Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of git://github.com/mat/mephisto

  • Loading branch information...
commit 15372c45281f9147418395421e467db1b2954d75 2 parents 7ee7981 + 449d0e1
@emk emk authored
View
12 README
@@ -16,6 +16,18 @@ XXX oh, we can't depend on the rails helpers at all, because they don't
translate the time from UTC (assuming the TZ env var is correctly
set) to site time, you've to roll our own, or monkey patch rails :/
+= Tests
+
+First make sure you have configured a test database in config/database.yml.
+
+Running the tests requires installing additional gems
+
+ sudo rake gems:install RAILS_ENV=test
+
+You can now run the tests
+
+ rake test
+
= License
Mephisto is distributed under the same license as Ruby on Rails. See
View
8 config/environment.rb
@@ -86,14 +86,6 @@ def safe_to_load_application?
config.gem 'tzinfo', :version => '>= 0.3.12'
config.gem 'emk-safe_erb', :version => '>= 0.1.2', :lib => 'safe_erb',
:source => 'http://gems.github.com'
-
- # These libraries are needed for our tests and specs.
- config.gem 'faker', :version => '>= 0.3.1'
- config.gem 'notahat-machinist', :version => '>= 0.1.2', :lib => 'machinist',
- :source => 'http://gems.github.com'
- config.gem 'nokogiri', :version => '>= 1.1.0' # Used by webrat.
- config.gem 'brynary-webrat', :version => '>= 0.3.2.2', :lib => 'webrat',
- :source => 'http://gems.github.com'
end
# Don't update this file, make custom tweaks in config/initializers/custom.rb,
View
11 config/environments/test.rb
@@ -7,3 +7,14 @@
# Disable request forgery protection in test environment
config.action_controller.allow_forgery_protection = false
+
+ # These libraries are needed for our tests and specs.
+config.gem 'faker', :version => '>= 0.3.1'
+config.gem 'notahat-machinist', :version => '>= 0.1.2', :lib => 'machinist',
+ :source => 'http://gems.github.com'
+config.gem 'nokogiri', :version => '>= 1.1.0' # Used by webrat.
+config.gem 'brynary-webrat', :version => '>= 0.3.2.2', :lib => 'webrat',
+ :source => 'http://gems.github.com'
+
+config.gem 'ruby-debug'
+
View
2  lib/tasks/session_store.rake
@@ -4,7 +4,7 @@ file 'config/initializers/session_store.rb' do
f.write <<"EOD"
# This file was generated by 'rake config/initializers/session_store.rb',
# and should not be made visible to public. Do not check it into github!
-# If you have a load-balancing Mephisto cluser, you will need to use the
+# If you have a load-balancing Mephisto cluster, you will need to use the
# same version of this file on each machine. And be sure to restart your
# server when you modify this file.
Please sign in to comment.
Something went wrong with that request. Please try again.