Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

rails3 update

  • Loading branch information...
commit 4cd379c880c6652e18238b8bd951d889bb8bd91b 1 parent 81c45ab
@mjankowski mjankowski authored
Showing with 402 additions and 201 deletions.
  1. +3 −31 README.textile
  2. +0 −18 Rakefile
  3. +19 −15 app/controllers/flutie/styleguides_controller.rb
  4. +0 −7 config/flutie_routes.rb
  5. 0  config/{flutie_expansion.rb → initializers/expansion.rb}
  6. +5 −0 config/routes.rb
  7. +11 −69 flutie.gemspec
  8. +0 −1  init.rb
  9. +0 −19 install.rb
  10. +1 −2  lib/flutie.rb
  11. +6 −0 lib/flutie/engine.rb
  12. +0 −14 lib/flutie/extensions/routes.rb
  13. +17 −0 lib/tasks/flutie.rake
  14. +0 −1  rails/init.rb
  15. +4 −0 test/dummy/.gitignore
  16. +10 −0 test/dummy/Rakefile
  17. +3 −0  test/dummy/app/controllers/application_controller.rb
  18. +2 −0  test/dummy/app/helpers/application_helper.rb
  19. +4 −0 test/dummy/config.ru
  20. +45 −0 test/dummy/config/application.rb
  21. +14 −0 test/dummy/config/boot.rb
  22. +22 −0 test/dummy/config/database.yml
  23. +5 −0 test/dummy/config/environment.rb
  24. +19 −0 test/dummy/config/environments/development.rb
  25. +42 −0 test/dummy/config/environments/production.rb
  26. +29 −0 test/dummy/config/environments/test.rb
  27. +7 −0 test/dummy/config/initializers/backtrace_silencers.rb
  28. +10 −0 test/dummy/config/initializers/inflections.rb
  29. +5 −0 test/dummy/config/initializers/mime_types.rb
  30. +7 −0 test/dummy/config/initializers/secret_token.rb
  31. +10 −0 test/dummy/config/initializers/session_store.rb
  32. +5 −0 test/dummy/config/locales/en.yml
  33. +58 −0 test/dummy/config/routes.rb
  34. +7 −0 test/dummy/db/seeds.rb
  35. +9 −0 test/dummy/script/rails
  36. +15 −14 test/functional/styleguides_controller_test.rb
  37. +8 −10 test/test_helper.rb
View
34 README.textile
@@ -4,11 +4,11 @@ Basic, default styles for rails applications
h2. Installation
-Flutie is a Rails engine. It works with versions of Rails greater than 2.3.
+Flutie is a Rails engine. It works with versions of Rails greater than 3.0.
-Flutie is recommended to be run as a plugin so that the automatic installer is run.
+Flutie is recommended to be run as a gem and included in your Gemfile.
- $ ruby script/plugin install -f git@github.com:thoughtbot/flutie.git
+ $ rake flutie:install
The installer will copy the Flutie stylesheets into public/flutie/stylesheets
@@ -45,34 +45,6 @@ bc.. <div class="pagination">
<a href="#next">Next</a>
</div>
-h2. Gem Installation
-
-You can also install Flutie as a gem, but then you'll need to run the install task manually.
-
-In config/environment.rb:
-
-<pre>
-config.gem "thoughtbot-flutie",
- :lib => 'flutie',
- :source => 'http://gems.github.com',
- :version => '1.0.0'
-</pre>
-
-Vendor the gem:
-
-<pre>
-rake gems:install
-rake gems:unpack
-</pre>
-
-Run the installer:
-
-<pre>
-ruby vendor/gems/thoughtbot-flutie-1.0.0/install.rb
-</pre>
-
-h2.
-
h2. Authors
Flutie was written by thoughtbot, inc.
View
18 Rakefile
@@ -21,21 +21,3 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
rdoc.rdoc_files.include('README')
rdoc.rdoc_files.include('lib/**/*.rb')
end
-
-gem_spec = Gem::Specification.new do |gem_spec|
- gem_spec.name = "flutie"
- gem_spec.version = "1.0"
- gem_spec.summary = "style defaults"
- gem_spec.email = "support@thoughtbot.com"
- gem_spec.homepage = "http://github.com/thoughtbot/flutie"
- gem_spec.description = "Rails authentication with email & password."
- gem_spec.authors = ["thoughtbot"]
- gem_spec.files = FileList["[A-Z]*", "{app,config,lib,rails}/**/*"]
-end
-
-desc "Generate a gemspec file"
-task :gemspec do
- File.open("#{gem_spec.name}.gemspec", 'w') do |f|
- f.write gem_spec.to_yaml
- end
-end
View
34 app/controllers/flutie/styleguides_controller.rb
@@ -1,23 +1,27 @@
-class Flutie::StyleguidesController < ApplicationController
+module Flutie
- unloadable
+ class StyleguidesController < ApplicationController
- def show
- @styleguides = styleguides
- render :layout => "flutie" if params[:flutie] == "true"
- end
+ unloadable
+
+ def show
+ @styleguides = styleguides
+ render :layout => "flutie" if params[:flutie] == "true"
+ end
- private
+ private
- def styleguides
- all_styleguide_partials = ActionController::Base.view_paths.map do |view_path|
- styleguide_path = File.join(view_path, 'styleguides')
- if File.exists?(styleguide_path)
- Dir.glob(styleguide_path + '/_*.*')
- else
- nil
+ def styleguides
+ all_styleguide_partials = ActionController::Base.view_paths.map do |view_path|
+ styleguide_path = File.join(view_path.to_s, 'styleguides')
+ if File.exists?(styleguide_path)
+ Dir.glob(styleguide_path + '/_*.*')
+ else
+ nil
+ end
end
+ all_styleguide_partials.flatten.compact
end
- all_styleguide_partials.flatten.compact
end
+
end
View
7 config/flutie_routes.rb
@@ -1,7 +0,0 @@
-ActionController::Routing::Routes.draw do |map|
-
- map.resource :styleguide,
- :controller => 'flutie/styleguides',
- :only => [:show]
-
-end
View
0  config/flutie_expansion.rb → config/initializers/expansion.rb
File renamed without changes
View
5 config/routes.rb
@@ -0,0 +1,5 @@
+Rails.application.routes.draw do |map|
+
+ resource :styleguides, :as => :styleguide, :controller => 'flutie/styleguides', :only => [:show]
+
+end
View
80 flutie.gemspec
@@ -1,69 +1,11 @@
---- !ruby/object:Gem::Specification
-name: flutie
-version: !ruby/object:Gem::Version
- version: 0.6.9
-platform: ruby
-authors:
-- thoughtbot
-autorequire:
-bindir: bin
-cert_chain: []
-
-date: 2009-07-24 00:00:00 -04:00
-default_executable:
-dependencies: []
-
-description: Default application styles
-email: support@thoughtbot.com
-executables: []
-
-extensions: []
-
-extra_rdoc_files: []
-
-files:
-- LICENSE
-- Rakefile
-- README.textile
-- app/controllers
-- app/controllers/flutie
-- app/controllers/flutie/styleguides_controller.rb
-- app/views
-- app/views/styleguides
-- app/views/styleguides/show.html.erb
-- config/flutie_routes.rb
-- lib/flutie
-- lib/flutie/extensions
-- lib/flutie/extensions/routes.rb
-- lib/flutier.rb
-- rails/init.rb
-has_rdoc: true
-homepage: http://github.com/thoughtbot/flutie
-licenses: []
-
-post_install_message:
-rdoc_options: []
-
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: "0"
- version:
-required_rubygems_version: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: "0"
- version:
-requirements: []
-
-rubyforge_project:
-rubygems_version: 1.3.4
-signing_key:
-specification_version: 3
-summary: Default application styles
-test_files: []
-
+Gem::Specification.new do |s|
+ s.name = 'flutie'
+ s.version = '1.0.0'
+ s.date = %q{2010-04-06}
+ s.email = 'support@thoughtbot.com'
+ s.homepage = 'http://github.com/thoughtbot/flutie'
+ s.summary = 'Flutie adds default stylesheets to web apps'
+ s.description = 'Flutie is a starting point for personal discovery'
+ s.files = ["app/controllers", "app/controllers/flutie", "app/controllers/flutie/styleguides_controller.rb", "app/views", "app/views/flutie", "app/views/flutie/styleguides", "app/views/flutie/styleguides/show.erb", "app/views/layouts", "app/views/layouts/flutie.erb", "config/initializers", "config/initializers/expansion.rb", "config/routes.rb", "lib/flutie", "lib/flutie/engine.rb", "lib/flutie.rb", "lib/tasks", "lib/tasks/flutie.rake", "README.textile"]
+ s.authors = ['Chad Pytel', 'Kevin Burg', 'Matt Jankowski', 'Mike Burns', 'Fred Yates']
+end
View
1  init.rb
@@ -1 +0,0 @@
-require 'flutie'
View
19 install.rb
@@ -1,19 +0,0 @@
-##
-## Copy over asset files (javascript/css/images) from the plugin directory to public/
-##
-
-require 'fileutils'
-
-def copy_files(source_path, destination_path, directory)
- source, destination = File.join(directory, source_path), File.join(RAILS_ROOT, destination_path)
- FileUtils.mkdir_p(destination, :verbose => true) unless File.exist?(destination)
- FileUtils.cp_r(source, destination, :verbose => true)
-end
-
-directory = File.dirname(__FILE__)
-
-# Copy the flutie stylesheets into rails_root/public/flutie
-copy_files("/public/stylesheets", "/public/flutie", directory)
-
-# Copy the stylesheet expansion into rails_root/config/initializers
-copy_files("/config/flutie_expansion.rb", "/config/initializers", directory)
View
3  lib/flutie.rb
@@ -1,4 +1,3 @@
module Flutie
+ require 'flutie/engine' if defined?(Rails)
end
-
-require 'flutie/extensions/routes'
View
6 lib/flutie/engine.rb
@@ -0,0 +1,6 @@
+module Flutie
+
+ class Engine < Rails::Engine
+ end
+
+end
View
14 lib/flutie/extensions/routes.rb
@@ -1,14 +0,0 @@
-if defined?(ActionController::Routing::RouteSet) && defined?(Rails) && !Rails.env.production?
- class ActionController::Routing::RouteSet
- def load_routes_with_flutie!
- lib_path = File.dirname(__FILE__)
- flutie_routes = File.join(lib_path, *%w[.. .. .. config flutie_routes.rb])
- unless configuration_files.include?(flutie_routes)
- add_configuration_file(flutie_routes)
- end
- load_routes_without_flutie!
- end
-
- alias_method_chain :load_routes!, :flutie
- end
-end
View
17 lib/tasks/flutie.rake
@@ -0,0 +1,17 @@
+require 'fileutils'
+
+def copy_files(source_path, destination_path, directory)
+ source, destination = File.join(directory, source_path), File.join(Rails.root, destination_path)
+ FileUtils.mkdir_p(destination, :verbose => true) unless File.exist?(destination)
+ FileUtils.cp_r(source, destination, :verbose => true)
+end
+
+directory = File.dirname(__FILE__)
+
+namespace :flutie do
+ desc 'install flutie stylesheets into public/ directory'
+ task :install => :environment do
+ # Copy the flutie stylesheets into rails_root/public/flutie
+ copy_files("../../public/stylesheets", "/public/flutie", directory)
+ end
+end
View
1  rails/init.rb
@@ -1 +0,0 @@
-require 'flutie'
View
4 test/dummy/.gitignore
@@ -0,0 +1,4 @@
+.bundle
+db/*.sqlite3
+log/*.log
+tmp/**/*
View
10 test/dummy/Rakefile
@@ -0,0 +1,10 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+Rails::Application.load_tasks
View
3  test/dummy/app/controllers/application_controller.rb
@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+ protect_from_forgery
+end
View
2  test/dummy/app/helpers/application_helper.rb
@@ -0,0 +1,2 @@
+module ApplicationHelper
+end
View
4 test/dummy/config.ru
@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment', __FILE__)
+run Dummy::Application
View
45 test/dummy/config/application.rb
@@ -0,0 +1,45 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+# If you have a Gemfile, require the gems listed there, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(:default, Rails.env) if defined?(Bundler)
+
+require 'flutie'
+
+module Dummy
+ class Application < Rails::Application
+ # Settings in config/environments/* take precedence over those specified here.
+ # Application configuration should go into files in config/initializers
+ # -- all .rb files in that directory are automatically loaded.
+
+ # Add additional load paths for your own custom dirs
+ # config.load_paths += %W( #{config.root}/extras )
+
+ # Only load the plugins named here, in the order given (default is alphabetical).
+ # :all can be used as a placeholder for all plugins not explicitly named
+ # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+ # Activate observers that should always be running
+ # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+ # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+ # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+ # config.time_zone = 'Central Time (US & Canada)'
+
+ # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+ # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+ # config.i18n.default_locale = :de
+
+ # Configure generators values. Many other options are available, be sure to check the documentation.
+ # config.generators do |g|
+ # g.orm :active_record
+ # g.template_engine :erb
+ # g.test_framework :test_unit, :fixture => true
+ # end
+
+ # Configure sensitive parameters which will be filtered from the log file.
+ config.filter_parameters << :password
+ end
+end
View
14 test/dummy/config/boot.rb
@@ -0,0 +1,14 @@
+# Use locked gems if present.
+begin
+ require File.expand_path('../../.bundle/environment', __FILE__)
+
+rescue LoadError
+ # Otherwise, use RubyGems.
+ require 'rubygems'
+
+ # And set up the gems listed in the Gemfile.
+ if File.exist?(File.expand_path('../../Gemfile', __FILE__))
+ require 'bundler'
+ Bundler.setup
+ end
+end
View
22 test/dummy/config/database.yml
@@ -0,0 +1,22 @@
+# SQLite version 3.x
+# gem install sqlite3-ruby (not necessary on OS X Leopard)
+development:
+ adapter: sqlite3
+ database: db/development.sqlite3
+ pool: 5
+ timeout: 5000
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+ adapter: sqlite3
+ database: db/test.sqlite3
+ pool: 5
+ timeout: 5000
+
+production:
+ adapter: sqlite3
+ database: db/production.sqlite3
+ pool: 5
+ timeout: 5000
View
5 test/dummy/config/environment.rb
@@ -0,0 +1,5 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+Dummy::Application.initialize!
View
19 test/dummy/config/environments/development.rb
@@ -0,0 +1,19 @@
+Dummy::Application.configure do
+ # Settings specified here will take precedence over those in config/environment.rb
+
+ # In the development environment your application's code is reloaded on
+ # every request. This slows down response time but is perfect for development
+ # since you don't have to restart the webserver when you make code changes.
+ config.cache_classes = false
+
+ # Log error messages when you accidentally call methods on nil.
+ config.whiny_nils = true
+
+ # Show full error reports and disable caching
+ config.consider_all_requests_local = true
+ config.action_view.debug_rjs = true
+ config.action_controller.perform_caching = false
+
+ # Don't care if the mailer can't send
+ config.action_mailer.raise_delivery_errors = false
+end
View
42 test/dummy/config/environments/production.rb
@@ -0,0 +1,42 @@
+Dummy::Application.configure do
+ # Settings specified here will take precedence over those in config/environment.rb
+
+ # The production environment is meant for finished, "live" apps.
+ # Code is not reloaded between requests
+ config.cache_classes = true
+
+ # Full error reports are disabled and caching is turned on
+ config.consider_all_requests_local = false
+ config.action_controller.perform_caching = true
+
+ # Specifies the header that your server uses for sending files
+ config.action_dispatch.x_sendfile_header = "X-Sendfile"
+
+ # For nginx:
+ # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+
+ # If you have no front-end server that supports something like X-Sendfile,
+ # just comment this out and Rails will serve the files
+
+ # See everything in the log (default is :info)
+ # config.log_level = :debug
+
+ # Use a different logger for distributed setups
+ # config.logger = SyslogLogger.new
+
+ # Use a different cache store in production
+ # config.cache_store = :mem_cache_store
+
+ # Disable Rails's static asset server
+ # In production, Apache or nginx will already do this
+ config.serve_static_assets = false
+
+ # Enable serving of images, stylesheets, and javascripts from an asset server
+ # config.action_controller.asset_host = "http://assets.example.com"
+
+ # Disable delivery errors, bad email addresses will be ignored
+ # config.action_mailer.raise_delivery_errors = false
+
+ # Enable threaded mode
+ # config.threadsafe!
+end
View
29 test/dummy/config/environments/test.rb
@@ -0,0 +1,29 @@
+Dummy::Application.configure do
+ # Settings specified here will take precedence over those in config/environment.rb
+
+ # The test environment is used exclusively to run your application's
+ # test suite. You never need to work with it otherwise. Remember that
+ # your test database is "scratch space" for the test suite and is wiped
+ # and recreated between test runs. Don't rely on the data there!
+ config.cache_classes = true
+
+ # Log error messages when you accidentally call methods on nil.
+ config.whiny_nils = true
+
+ # Show full error reports and disable caching
+ config.consider_all_requests_local = true
+ config.action_controller.perform_caching = false
+
+ # Disable request forgery protection in test environment
+ config.action_controller.allow_forgery_protection = false
+
+ # Tell Action Mailer not to deliver emails to the real world.
+ # The :test delivery method accumulates sent emails in the
+ # ActionMailer::Base.deliveries array.
+ config.action_mailer.delivery_method = :test
+
+ # Use SQL instead of Active Record's schema dumper when creating the test database.
+ # This is necessary if your schema can't be completely dumped by the schema dumper,
+ # like if you have constraints or database-specific column types
+ # config.active_record.schema_format = :sql
+end
View
7 test/dummy/config/initializers/backtrace_silencers.rb
@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
+# Rails.backtrace_cleaner.remove_silencers!
View
10 test/dummy/config/initializers/inflections.rb
@@ -0,0 +1,10 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format
+# (all these examples are active by default):
+# ActiveSupport::Inflector.inflections do |inflect|
+# inflect.plural /^(ox)$/i, '\1en'
+# inflect.singular /^(ox)en/i, '\1'
+# inflect.irregular 'person', 'people'
+# inflect.uncountable %w( fish sheep )
+# end
View
5 test/dummy/config/initializers/mime_types.rb
@@ -0,0 +1,5 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
+# Mime::Type.register_alias "text/html", :iphone
View
7 test/dummy/config/initializers/secret_token.rb
@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+Rails.application.config.secret_token = 'd7457c7a1642947497f2e01365e1350dddc06bc03b6b5eba61d6bcb5e658836fe9b879392f1ea11d75787af21daeca6ec30d0b143faa9192fe610e25c0a3a41a'
View
10 test/dummy/config/initializers/session_store.rb
@@ -0,0 +1,10 @@
+# Be sure to restart your server when you modify this file.
+
+Rails.application.config.session_store :cookie_store, {
+ :key => '_dummy_session',
+}
+
+# Use the database for sessions instead of the cookie-based default,
+# which shouldn't be used to store highly confidential information
+# (create the session table with "rake db:sessions:create")
+# Rails.application.config.session_store :active_record_store
View
5 test/dummy/config/locales/en.yml
@@ -0,0 +1,5 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+ hello: "Hello world"
View
58 test/dummy/config/routes.rb
@@ -0,0 +1,58 @@
+Dummy::Application.routes.draw do |map|
+ # The priority is based upon order of creation:
+ # first created -> highest priority.
+
+ # Sample of regular route:
+ # match 'products/:id' => 'catalog#view'
+ # Keep in mind you can assign values other than :controller and :action
+
+ # Sample of named route:
+ # match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
+ # This route can be invoked with purchase_url(:id => product.id)
+
+ # Sample resource route (maps HTTP verbs to controller actions automatically):
+ # resources :products
+
+ # Sample resource route with options:
+ # resources :products do
+ # member do
+ # get :short
+ # post :toggle
+ # end
+ #
+ # collection do
+ # get :sold
+ # end
+ # end
+
+ # Sample resource route with sub-resources:
+ # resources :products do
+ # resources :comments, :sales
+ # resource :seller
+ # end
+
+ # Sample resource route with more complex sub-resources
+ # resources :products do
+ # resources :comments
+ # resources :sales do
+ # get :recent, :on => :collection
+ # end
+ # end
+
+ # Sample resource route within a namespace:
+ # namespace :admin do
+ # # Directs /admin/products/* to Admin::ProductsController
+ # # (app/controllers/admin/products_controller.rb)
+ # resources :products
+ # end
+
+ # You can have the root of your site routed with "root"
+ # just remember to delete public/index.html.
+ # root :to => "welcome#index"
+
+ # See how all your routes lay out with "rake routes"
+
+ # This is a legacy wild controller route that's not recommended for RESTful applications.
+ # Note: This route will make all actions in every controller accessible via GET requests.
+ # match ':controller(/:action(/:id(.:format)))'
+end
View
7 test/dummy/db/seeds.rb
@@ -0,0 +1,7 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+#
+# Examples:
+#
+# cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
+# Mayor.create(:name => 'Daley', :city => cities.first)
View
9 test/dummy/script/rails
@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+ENV_PATH = File.expand_path('../../config/environment', __FILE__)
+BOOT_PATH = File.expand_path('../../config/boot', __FILE__)
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+
+require BOOT_PATH
+require 'rails/commands'
View
29 test/functional/styleguides_controller_test.rb
@@ -1,12 +1,7 @@
require 'test_helper'
-class ApplicationController < ActionController::Base
-end
-
ActionController::Base.prepend_view_path File.join(File.dirname(__FILE__), '..', '..', 'app', 'views')
ActionController::Base.prepend_view_path File.join(File.dirname(__FILE__), '..', 'fixtures', 'app', 'views')
-require "flutie/styleguides_controller"
-require File.join(File.dirname(__FILE__), '..', '..', 'config', 'flutie_routes')
class Flutie::StyleguidesControllerTest < ActionController::TestCase
def self.should_render_well_formed_xml
@@ -27,9 +22,11 @@ def self.should_render_all_styleguide_partials
context "on GET to /styleguides/show" do
setup { get :show }
- should_respond_with :success
- should_render_template :show
- should_render_without_layout
+ should respond_with :success
+ should render_template :show
+ should "not have a layout" do
+ assert_template :layout => nil, :partial => '_one', :count => 1
+ end
should_render_well_formed_xml
should_render_all_styleguide_partials
end
@@ -37,9 +34,11 @@ def self.should_render_all_styleguide_partials
context "on GET to /styleguides/show with flutie=false" do
setup { get :show, :flutie => "false" }
- should_respond_with :success
- should_render_template :show
- should_render_without_layout
+ should respond_with :success
+ should render_template :show
+ should "not have a layout" do
+ assert_template :layout => nil, :partial => '_one', :count => 1
+ end
should_render_well_formed_xml
should_render_all_styleguide_partials
end
@@ -47,9 +46,11 @@ def self.should_render_all_styleguide_partials
context "on GET to /styleguides/show with flutie=true" do
setup { get :show, :flutie => "true" }
- should_respond_with :success
- should_render_template :show
- should_render_with_layout :flutie
+ should respond_with :success
+ should render_template :show
+ should "have a layout of flutie" do
+ assert_template :layout => 'flutie', :partial => '_one', :count => 1
+ end
should_render_well_formed_xml
should_render_all_styleguide_partials
end
View
18 test/test_helper.rb
@@ -1,16 +1,14 @@
-ENV['RAILS_ENV'] = 'test'
+# Configure Rails Envinronment
+ENV["RAILS_ENV"] = "test"
-require 'rubygems'
-require 'active_support'
-require 'active_support/test_case'
-require 'action_controller'
-require 'test_help'
-require 'flutie'
-require 'config/flutie_expansion'
-require 'rexml/document'
+require File.expand_path("../dummy/config/environment.rb", __FILE__)
+require "rails/test_help"
-$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'app', 'controllers')
+ActionMailer::Base.delivery_method = :test
+ActionMailer::Base.perform_deliveries = true
+ActionMailer::Base.default_url_options[:host] = "test.com"
require 'shoulda'
require 'shoulda/rails'
+require 'rexml/document'
begin require 'redgreen'; rescue LoadError; end
Please sign in to comment.
Something went wrong with that request. Please try again.