Permalink
Browse files

conform to version generated by version 1.1.6 of rails_apps_composer

  • Loading branch information...
1 parent 9265a96 commit 4a88a37b2081b7930891916e500daa811d935f7f @DanielKehoe DanielKehoe committed Mar 1, 2012
Showing with 49 additions and 17 deletions.
  1. +3 −0 .gitignore
  2. +10 −11 Gemfile.lock
  3. +1 −1 config/cucumber.yml
  4. +13 −2 config/environments/development.rb
  5. +16 −1 config/environments/production.rb
  6. +4 −0 config/environments/test.rb
  7. +2 −2 config/routes.rb
View
@@ -65,6 +65,9 @@ db/*.sqlite3
# Netbeans project directory
/nbproject/
+# RubyMine project files
+.idea
+
# Textmate project files
/*.tmproj
View
@@ -48,10 +48,10 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.2.0)
- cucumber (1.1.8)
+ cucumber (1.1.9)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
- gherkin (~> 2.8.0)
+ gherkin (~> 2.9.0)
json (>= 1.4.6)
term-ansicolor (>= 1.0.6)
cucumber-rails (1.3.0)
@@ -77,16 +77,15 @@ GEM
factory_girl (~> 2.6.0)
railties (>= 3.0.0)
ffi (1.0.11)
- gherkin (2.8.0)
+ gherkin (2.9.0)
json (>= 1.4.6)
hike (1.2.1)
i18n (0.6.0)
- journey (1.0.2)
- jquery-rails (2.0.0)
- railties (>= 3.2.0.beta, < 5.0)
+ journey (1.0.3)
+ jquery-rails (2.0.1)
+ railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
json (1.6.5)
- json_pure (1.6.5)
launchy (2.0.5)
addressable (~> 2.2.6)
mail (2.4.1)
@@ -142,10 +141,10 @@ GEM
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.13.0)
- childprocess (>= 0.2.1)
- ffi (~> 1.0.9)
- json_pure
+ selenium-webdriver (2.20.0)
+ childprocess (>= 0.2.5)
+ ffi (~> 1.0)
+ multi_json (~> 1.0)
rubyzip
sprockets (2.1.2)
hike (~> 1.2)
View
@@ -1,7 +1,7 @@
<%
rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
-std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} --strict --tags ~@wip"
+std_opts = "-r features/support/ -r features/step_definitions --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} --strict --tags ~@wip"
%>
default: <%= std_opts %> features
wip: --tags @wip:3 --wip features
@@ -15,12 +15,23 @@
# ActionMailer Config
config.action_mailer.default_url_options = { :host => 'localhost:3000' }
- # A dummy setup for development - no deliveries, but logged
config.action_mailer.delivery_method = :smtp
- config.action_mailer.perform_deliveries = false
+ # change to false to prevent email from being sent during development
+ config.action_mailer.perform_deliveries = true
config.action_mailer.raise_delivery_errors = true
config.action_mailer.default :charset => "utf-8"
+ config.action_mailer.smtp_settings = {
+ address: "smtp.gmail.com",
+ port: 587,
+ domain: "example.com",
+ authentication: "plain",
+ enable_starttls_auto: true,
+ user_name: ENV["GMAIL_USERNAME"],
+ password: ENV["GMAIL_PASSWORD"]
+ }
+
+
# Print deprecation notices to the Rails logger
config.active_support.deprecation = :log
@@ -61,12 +61,27 @@
# Send deprecation notices to registered listeners
config.active_support.deprecation = :notify
- config.action_mailer.default_url_options = { :host => 'yourhost.com' }
+ config.action_mailer.default_url_options = { :host => 'example.com' }
# ActionMailer Config
# Setup for production - deliveries, no errors raised
config.action_mailer.delivery_method = :smtp
config.action_mailer.perform_deliveries = true
config.action_mailer.raise_delivery_errors = false
config.action_mailer.default :charset => "utf-8"
+ config.action_mailer.smtp_settings = {
+ address: "smtp.gmail.com",
+ port: 587,
+ domain: "example.com",
+ authentication: "plain",
+ enable_starttls_auto: true,
+ user_name: ENV["GMAIL_USERNAME"],
+ password: ENV["GMAIL_PASSWORD"]
+ }
+
+
+
+ # Log the query plan for queries taking more than this (works
+ # with SQLite, MySQL, and PostgreSQL)
+ # config.active_record.auto_explain_threshold_in_seconds = 0.5
end
@@ -34,4 +34,8 @@
# Print deprecation notices to the stderr
config.active_support.deprecation = :stderr
+
+ # ActionMailer Config
+ config.action_mailer.default_url_options = { :host => 'example.com' }
+
end
View
@@ -1,5 +1,5 @@
-Rails3DeviseRspecCucumber::Application.routes.draw do
- #get \"users\/show\"
+Myapp::Application.routes.draw do
+
root :to => "home#index"

0 comments on commit 4a88a37

Please sign in to comment.