raygun 0.0.13 → 0.0.14

data/CHANGES.md

@@ -0,0 +1,11 @@
+# Change Log
+
+## 0.0.14 [2012-12-??]
+
+* Basic usage information.
+* Added guard-livereload to Guardfile.
+* Better specs for auth flows (register, password reset, sign in) (~98% coverage).
+* Use the new rspec expect(...).to syntax ([more info](http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax)).
+* Hardcode 1.9.3-p327 so that app_prototype is executable without futzing.
+* Consistent hostnames across environments.
+* Use mailcatcher when it's running locally ([more info](http://www.mikeperham.com/2012/12/09/12-gems-of-christmas-4-mailcatcher-and-mail_view/)).

data/README.md

@@ -2,12 +2,8 @@
 
 # Raygun
 
-__NOTE: Currently a work in progress and not yet representative of best practices. Soon the veil will be lifted.__
-
-Command line Rails application generator that builds a new project skeleton configured with all of the Carbon Five
-best practices baked right in.
-
-Inspired by and code shamelessly lifted from ThoughtBot's Suspenders. Thanks!
+Rails application generator that builds a new project skeleton configured with Carbon Five preferences and
+best practices baked right in. Spend less time configuring stuff and more building cool stuff.
 
 Major tools/libraries:
 
@@ -21,10 +17,12 @@ Major tools/libraries:
 * RSpec
 * Factory Girl
 * Jasmine
-* Guard
+* Guard (rspec, jasmine, livereload)
 
 And many tweaks, patterns and common recipes.
 
+Inspired by Xavier Shay and ThoughtBot's Suspenders. Thanks!
+
 ## Projects Goals
 
 Raygun...
@@ -41,10 +39,12 @@ Raygun...
 
 Be sure you met these requirements before using raygun, otherwise you won't make it very far (misfire!).
 
-* Ruby 1.9.2+ (rvm and rbenv supported)
+* Ruby 1.9.3-p327 (rvm and rbenv supported)
 * PostgreSQL 9.x with superuser 'postgres' with no password (```createuser -s postgres```)
 * PhantomJS for JavaScript testing (```brew install phantomjs```)
 
+If you're using another ruby, just change the Gemfile, .rvmrc and/or .rbenv as necessary before running bundle.
+
 ## Usage
 
     $ raygun your-project
@@ -52,6 +52,7 @@ Be sure you met these requirements before using raygun, otherwise you won't make
 Once your project is baked out, you can easily kick the wheels:
 
     $ cd your-project
+    $ gem install bundler
     $ bundle update
 
     # Prepare the database: schema and reference / sample data
@@ -74,6 +75,10 @@ Once your project is baked out, you can easily kick the wheels:
 
 ### Development
 
-Generate an example app using your local development version of raygun
+Generate an example app using your local development version of raygun:
 
     ./bin/raygun tmp/example_app
+
+## Changes
+
+[View the Change Log](https://github.com/carbonfive/raygun/tree/master/CHANGES.md)

data/app_prototype/.rbenv-version

@@ -0,0 +1 @@
+1.9.3-p327

data/app_prototype/Gemfile

@@ -1,5 +1,8 @@
 source 'https://rubygems.org'
 
+# Heroku uses the ruby version to configure your application's runtime.
+ruby '1.9.3'
+
 gem 'thin'
 gem 'rails', '~> 3.2.9'
 gem 'slim-rails'
@@ -23,6 +26,7 @@ end
 group :test, :development do
   gem 'rspec-rails', '~> 2.12.0'
   gem 'capybara', github: 'jnicklas/capybara' # Switch from github once issue #882 is resolved.
+  gem 'capybara-email'
   gem 'factory_girl_rails'
   gem 'jasminerice'
   gem 'timecop'
@@ -31,6 +35,8 @@ end
 
 group :development do
   gem 'foreman'
+  gem 'launchy'
+  gem 'mailcatcher'
   gem 'guard'
   gem 'guard-rspec'
   gem 'guard-jasmine'

data/app_prototype/Guardfile

@@ -1,7 +1,15 @@
-# A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'rspec' do
+guard :livereload do
+  watch(%r{app/views/.+\.slim$})
+  watch(%r{app/helpers/.+\.rb})
+  watch(%r{public/.+\.(css|js|html)})
+  watch(%r{config/locales/.+\.yml})
+  # Rails Assets Pipeline
+  watch(%r{(app|vendor)(/assets/\w+/(.+\.(css|js|html))).*}) { |m| "/assets/#{m[3]}" }
+end
+
+guard :rspec do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }

data/app_prototype/README.md

@@ -6,7 +6,7 @@ Overview
 Requirements
 ============
 
-* ruby 1.9.?
+* ruby 1.9.3-p327
 * postgresql 9.? (user 'postgres' with no password)
 
 Running the Specs

data/app_prototype/app/controllers/password_resets_controller.rb

@@ -1,32 +1,30 @@
 class PasswordResetsController < ApplicationController
 
   skip_before_filter :require_login
+  skip_authorization_check
 
   def create
     @user = User.find_by_email(params[:email])
-    
+
     # Send an email to the user with instructions on how to reset their password.
     @user.deliver_reset_password_instructions! if @user
-    
+
     # Tell the user instructions have been sent whether or not email was found.
     # This is to not leak information to attackers about which emails exist in the system.
     redirect_to sign_in_path, notice: "Password reset instructions have been sent to your email."
   end
 
   def edit
-    @user = User.load_from_reset_password_token(params[:id])
-    @token = params[:id]
+    @token = params[:token]
+    @user = User.load_from_reset_password_token(@token)
     not_authenticated if !@user
   end
-  
+
   def update
     @token = params[:token] # needed to render the form again in case of error
     @user = User.load_from_reset_password_token(@token)
     not_authenticated if !@user
 
-    # Makes the password confirmation validation work.
-    @user.password_confirmation = params[:user][:password_confirmation]
-
     # Clear the temporary token and update the password.
     if @user.change_password!(params[:user][:password])
       redirect_to sign_in_path, notice: "Password was successfully updated."

data/app_prototype/app/controllers/registrations_controller.rb

@@ -7,7 +7,7 @@ class RegistrationsController < ApplicationController
   end
 
   def create
-    @user = User.new(params[:user])
+    @user = User.new(params[:user]) # TODO Safe attributes
 
     if @user.save
       redirect_to sign_in_path, notice: "Thanks for signing up. Please check your email for activation instructions."

data/app_prototype/app/mailers/user_mailer.rb

@@ -4,19 +4,16 @@ class UserMailer < ActionMailer::Base
 
   def activation_needed_email(user)
     @user = user
-    @url  = "http://0.0.0.0:3000/sign_up/#{user.activation_token}/activate"
     mail to: user.email, subject: "Welcome to My Awesome Site!"
   end
 
   def activation_success_email(user)
     @user = user
-    @url  = "http://0.0.0.0:3000/sign_in"
     mail to: user.email, subject: "Your account has been activated!"
   end
 
   def reset_password_email(user)
     @user = user
-    @url  = "http://0.0.0.0:3000/password_resets/#{user.reset_password_token}/edit"
     mail to: user.email, subject: "Password reset requested"
   end
 end

data/app_prototype/app/models/user.rb

@@ -4,14 +4,17 @@ class User < ActiveRecord::Base
 
   authenticates_with_sorcery!
 
+  validates :name,
+            length: { maximum: 30 }
+
   validates :email,
             presence: true,
-            email: true
+            email: true,
+            uniqueness: true
 
   validates :password,
             presence: true,
             length: { minimum: 6 },
-            confirmation: true,
             if: :password
 
 end

data/app_prototype/app/views/layouts/application.html.slim

@@ -22,7 +22,7 @@ html
                     ul.dropdown-menu
                       li= link_to 'Sign Out', sign_out_path
                 - else
-                  li= link_to 'Sign in', sign_in_path
+                  li= link_to 'Sign In', sign_in_path
 
         - flash.each do |name, msg|
           = content_tag :div, raw(msg), class: "alert #{alert_class(name)}"

data/app_prototype/app/views/password_resets/edit.html.slim

@@ -1,13 +1,12 @@
 .page-header
   h1 Reset Your Password
 
-= simple_form_for(@user, url: password_reset_path(@user)) do |f|
+= simple_form_for(@user, url: reset_password_path(@user)) do |f|
   = f.error_notification
 
   .form-inputs
     = f.input :email, disabled: true
-    = f.input :password, required: true, autofocus: true
-    = f.input :password_confirmation, required: true
+    = f.input :password, label: 'New Password', required: true, autofocus: true
     = hidden_field_tag :token, @token
 
   .form-actions

data/app_prototype/app/views/password_resets/new.html.slim

@@ -1,11 +1,11 @@
 .page-header
   h1 Password Reset
 
-= form_tag(password_resets_path, method: :post) do
+= form_tag(forgotten_password_path, method: :post) do
   .control-group
     = label_tag :email, nil, class: 'control-label'
     .controls
       = text_field_tag :email, nil, placeholder: 'joe@example.com'
 
   .form-actions
-    = submit_tag "Reset my password!", class: 'btn btn-primary'
+    = submit_tag 'Reset My Password', class: 'btn btn-primary'

data/app_prototype/app/views/registrations/new.html.slim

@@ -8,7 +8,6 @@
     = f.input :name, autofocus: true
     = f.input :email
     = f.input :password
-    = f.input :password_confirmation
 
   .form-actions
-    = f.button :submit, 'Sign up', class: 'btn btn-primary'
+    = f.button :submit, 'Sign Up', class: 'btn btn-primary'

data/app_prototype/app/views/user_mailer/activation_needed_email.html.erb

@@ -10,8 +10,8 @@
       your username is: <%= @user.email %>.<br/>
     </p>
     <p>
-      To login to the site, just follow this link: <%= @url %>.
+      To login to the site, just follow this link: <%= link_to activation_url(@user.activation_token), activation_url(@user.activation_token) %>.
     </p>
     <p>Thanks for joining and have a great day!</p>
   </body>
-</html>
+</html>

data/app_prototype/app/views/user_mailer/activation_needed_email.text.erb

@@ -4,6 +4,6 @@ Welcome to example.com, <%= @user.email %>
 You have successfully signed up to example.com,
 your username is: <%= @user.email %>.
  
-To login to the site, just follow this link: <%= @url %>.
+To login to the site, just follow this link: <%= activation_url(@user.activation_token) %>
  
-Thanks for joining and have a great day!
+Thanks for joining and have a great day!

data/app_prototype/app/views/user_mailer/activation_success_email.html.erb

@@ -10,8 +10,8 @@
       your username is: <%= @user.email %>.<br/>
     </p>
     <p>
-      To login to the site, just follow this link: <%= @url %>.
+      To login to the site, just follow this link: <%= link_to sign_in_url, sign_in_url %>.
     </p>
     <p>Thanks for joining and have a great day!</p>
   </body>
-</html>
+</html>

data/app_prototype/app/views/user_mailer/activation_success_email.text.erb

@@ -4,6 +4,6 @@ Congratz, <%= @user.email %>
 You have successfully activated your example.com account,
 your username is: <%= @user.email %>.
  
-To login to the site, just follow this link: <%= @url %>.
+To login to the site, just follow this link: <%= sign_in_url %>
  
-Thanks for joining and have a great day!
+Thanks for joining and have a great day!

data/app_prototype/app/views/user_mailer/reset_password_email.html.erb

@@ -9,8 +9,8 @@
       You have requested to reset your password.
     </p>
     <p>
-      To choose a new password, just follow this link: <%= @url %>.
+      To choose a new password, just follow this link: <%= link_to reset_password_url(@user.reset_password_token), reset_password_url(@user.reset_password_token) %>.
     </p>
     <p>Have a great day!</p>
   </body>
-</html>
+</html>

data/app_prototype/app/views/user_mailer/reset_password_email.text.erb

@@ -3,6 +3,6 @@ Hello, <%= @user.email %>
  
 You have requested to reset your password.
  
-To choose a new password, just follow this link: <%= @url %>.
+To choose a new password, just follow this link: <%= reset_password_url(@user.reset_password_token) %>
  
-Have a great day!
+Have a great day!

data/app_prototype/app/views/user_sessions/new.html.slim

@@ -6,8 +6,8 @@
     = f.input :password
 
   ul.unstyled
-    li= link_to 'Sign up', sign_up_path
-    li= link_to 'Reset forgotten password', new_password_reset_path
+    li= link_to 'Sign Up', sign_up_path
+    li= link_to 'Reset Password', forgotten_password_path
 
   .form-actions
     = f.button :submit, 'Sign In', class: 'btn btn-primary'

data/app_prototype/app/views/users/show.html.slim

@@ -14,4 +14,4 @@ dl
 
 - if can?(:destroy, @user)
   '
-  = link_to'Destroy', user_path(@user), method: :delete, data: { confirm: "Are you sure?" }, class: 'btn btn-danger'
+  = link_to 'Destroy', user_path(@user), method: :delete, data: { confirm: "Are you sure?" }, class: 'btn btn-danger'

data/app_prototype/config/application.rb

@@ -4,9 +4,8 @@ require File.expand_path('../boot', __FILE__)
 require "active_record/railtie"
 require "action_controller/railtie"
 require "action_mailer/railtie"
-require "active_resource/railtie"
+#require "active_resource/railtie"
 require "sprockets/railtie"
-# require "rails/test_unit/railtie"
 
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
@@ -23,6 +22,7 @@ module AppPrototype
       #generate.helper        false
       generate.routing_specs false
       #generate.view_specs    false
+      generate.request_specs false
     end
 
     # Settings in config/environments/* take precedence over those specified here.

data/app_prototype/config/environments/acceptance.rb

@@ -65,5 +65,5 @@ AppPrototype::Application.configure do
   # with SQLite, MySQL, and PostgreSQL)
   # config.active_record.auto_explain_threshold_in_seconds = 0.5
 
-  config.action_mailer.default_url_options = { host: 'acceptance.app_prototype.com' }
+  config.action_mailer.default_url_options = { host: 'app_prototype-acceptance.herokuapp.com' }
 end

data/app_prototype/config/environments/development.rb

@@ -35,5 +35,5 @@ AppPrototype::Application.configure do
   # Expands the lines which load the assets
   config.assets.debug = true
 
-  config.action_mailer.default_url_options = { host: 'app_prototype.local' }
+  config.action_mailer.default_url_options = { host: '0.0.0.0:3000' }
 end

data/app_prototype/config/environments/production.rb

@@ -65,5 +65,5 @@ AppPrototype::Application.configure do
   # with SQLite, MySQL, and PostgreSQL)
   # config.active_record.auto_explain_threshold_in_seconds = 0.5
 
-  config.action_mailer.default_url_options = { host: 'app_prototype.com' }
+  config.action_mailer.default_url_options = { host: 'app_prototype.herokuapp.com' }
 end

data/app_prototype/config/environments/test.rb

@@ -37,4 +37,6 @@ AppPrototype::Application.configure do
 
   config.action_mailer.default_url_options = { host: 'example.com' }
 end
+
+# Turn down the cost so that specs run quickly.
 Sorcery::CryptoProviders::BCrypt.cost = 1

data/app_prototype/config/initializers/email.rb

@@ -0,0 +1,11 @@
+# http://www.mikeperham.com/2012/12/09/12-gems-of-christmas-4-mailcatcher-and-mail_view/
+
+begin
+  sock = TCPSocket.new('localhost', 1025)
+  sock.close
+  catcher = true
+rescue
+  catcher = false
+end
+
+ActionMailer::Base.smtp_settings = (Rails.env.development? && catcher) ? { host: 'localhost', port: '1025', } : {}

data/app_prototype/config/initializers/secret_token.rb

@@ -4,4 +4,4 @@
 # 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.
-AppPrototype::Application.config.secret_token = 'SECRET_TOKEN_REPLACE_ME_TODO'
+AppPrototype::Application.config.secret_token = 'SUPER_SECRET_TOKEN_REPLACE_ME_TODO'

data/app_prototype/config/routes.rb

@@ -1,21 +1,21 @@
 AppPrototype::Application.routes.draw do
-  match 'sign_in'  => 'user_sessions#new',     as: :sign_in
 
+  match 'sign_in'  => 'user_sessions#new',     as: :sign_in
   match 'sign_out' => 'user_sessions#destroy', as: :sign_out
 
   resources :user_sessions, only: [:new, :create, :destroy]
 
-  resources :registrations, only: [:new, :create, :activate]
-
-  match 'sign_up' => 'registrations#new', via: :get
+  #resources :registrations, only: [:new, :create, :activate]
+  match 'sign_up' => 'registrations#new',              via: :get,  as: :sign_up
+  match 'sign_up' => 'registrations#create',           via: :post, as: :sign_up
+  match 'activate/:token' => 'registrations#activate', via: :get,  as: :activation
 
-  match 'sign_up' => 'registrations#create', via: :post
-
-  match 'sign_up/:token/activate' => 'registrations#activate', via: :get
-
-  resources :password_resets, only: [:new, :create, :edit, :update]
+  #resources :password_resets, only: [:new, :create, :edit, :update]
+  match 'forgotten_password' => 'password_resets#new',     via: :get,  as: :forgotten_password
+  match 'forgotten_password' => 'password_resets#create',  via: :post, as: :forgotten_password
+  match 'reset_password/:token' => 'password_resets#edit', via: :get,  as: :reset_password
+  match 'reset_password/:id' => 'password_resets#update',  via: :put
 
   resources :users
 
-
 end

data/app_prototype/config.ru

@@ -1,8 +1,18 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 
-# Disable buffering for real time logging (foreman and heroku).
+# Disable buffering for real time logging, see: https://devcenter.heroku.com/articles/logging#writing-to-your-log
 $stdout.sync = true
 
+# Optional Basic Auth - Enabled if BASIC_AUTH_PASSWORD is set. User is optional (any value will be accepted).
+BASIC_AUTH_USER     = ENV['BASIC_AUTH_USER']
+BASIC_AUTH_PASSWORD = ENV['BASIC_AUTH_PASSWORD']
+
+if BASIC_AUTH_PASSWORD
+  use Rack::Auth::Basic do |username, password|
+    password == BASIC_AUTH_PASSWORD && (BASIC_AUTH_USER.blank? || username == BASIC_AUTH_USER)
+  end
+end
+
 run AppPrototype::Application

data/app_prototype/db/sample_data.rb

@@ -10,14 +10,14 @@
 # Data that is required by the application across all environments (i.e. reference data) should _not_ be included here.
 # That belongs in seeds.rb instead.
 
-User.create! do |u|
-  u.email    = 'user@example.com'
+# TODO Disable sending emails, no need for seed data.
+
+User.find_or_create_by_email('user@example.com') do |u|
   u.name     = 'Ustead User'
   u.password = 'password'
 end.activate!
 
-User.create! do |u|
-  u.email    = 'admin@example.com'
+User.find_or_create_by_email('admin@example.com') do |u|
   u.name     = 'Adam Admin'
   u.password = 'password'
   u.admin    = true

data/app_prototype/lib/templates/rspec/scaffold/controller_spec.rb

@@ -22,39 +22,39 @@ describe <%= controller_class_name %>Controller do
   end
 
 <% unless options[:singleton] -%>
-  describe "GET index" do
+  describe "#index" do
     it "assigns all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
       get :index, {}, valid_session
-      assigns(:<%= table_name %>).should eq([<%= file_name %>])
+      expect(assigns(:<%= table_name %>)).to eq([<%= file_name %>])
     end
   end
 
 <% end -%>
-  describe "GET show" do
+  describe "#show" do
     it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
       get :show, { :id => <%= file_name %>.to_param }, valid_session
-      assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
+      expect(assigns(:<%= ns_file_name %>)).to eq(<%= file_name %>)
     end
   end
 
-  describe "GET new" do
+  describe "#new" do
     it "assigns a new <%= ns_file_name %> as @<%= ns_file_name %>" do
       get :new, {}, valid_session
-      assigns(:<%= ns_file_name %>).should be_a_new(<%= class_name %>)
+      expect(assigns(:<%= ns_file_name %>)).to be_a_new(<%= class_name %>)
     end
   end
 
-  describe "GET edit" do
+  describe "#edit" do
     it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
       get :edit, { :id => <%= file_name %>.to_param }, valid_session
-      assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
+      expect(assigns(:<%= ns_file_name %>)).to eq(<%= file_name %>)
     end
   end
 
-  describe "POST create" do
+  describe "#create" do
     describe "with valid params" do
       it "creates a new <%= class_name %>" do
         expect {
@@ -64,13 +64,13 @@ describe <%= controller_class_name %>Controller do
 
       it "assigns a newly created <%= ns_file_name %> as @<%= ns_file_name %>" do
         post :create, {:<%= ns_file_name %> => valid_attributes }, valid_session
-        assigns(:<%= ns_file_name %>).should be_a(<%= class_name %>)
-        assigns(:<%= ns_file_name %>).should be_persisted
+        expect(assigns(:<%= ns_file_name %>)).to be_a(<%= class_name %>)
+        expect(assigns(:<%= ns_file_name %>)).to be_persisted
       end
 
       it "redirects to the created <%= ns_file_name %>" do
         post :create, { :<%= ns_file_name %> => valid_attributes }, valid_session
-        response.should redirect_to(<%= class_name %>.last)
+        expect(response).to redirect_to(<%= class_name %>.last)
       end
     end
 
@@ -79,19 +79,19 @@ describe <%= controller_class_name %>Controller do
         # Trigger the behavior that occurs when invalid params are submitted
         <%= class_name %>.any_instance.stub(:save).and_return(false)
         post :create, { :<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %> }, valid_session
-        assigns(:<%= ns_file_name %>).should be_a_new(<%= class_name %>)
+        expect(assigns(:<%= ns_file_name %>)).to be_a_new(<%= class_name %>)
       end
 
       it "re-renders the 'new' template" do
         # Trigger the behavior that occurs when invalid params are submitted
         <%= class_name %>.any_instance.stub(:save).and_return(false)
         post :create, { :<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %> }, valid_session
-        response.should render_template("new")
+        expect(response).to render_template("new")
       end
     end
   end
 
-  describe "PUT update" do
+  describe "#update" do
     describe "with valid params" do
       it "updates the requested <%= ns_file_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
@@ -106,13 +106,13 @@ describe <%= controller_class_name %>Controller do
       it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
         put :update, { :id => <%= file_name %>.to_param, :<%= ns_file_name %> => valid_attributes }, valid_session
-        assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
+        expect(assigns(:<%= ns_file_name %>)).to eq(<%= file_name %>)
       end
 
       it "redirects to the <%= ns_file_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
         put :update, { :id => <%= file_name %>.to_param, :<%= ns_file_name %> => valid_attributes }, valid_session
-        response.should redirect_to(<%= file_name %>)
+        expect(response).to redirect_to(<%= file_name %>)
       end
     end
 
@@ -122,7 +122,7 @@ describe <%= controller_class_name %>Controller do
         # Trigger the behavior that occurs when invalid params are submitted
         <%= class_name %>.any_instance.stub(:save).and_return(false)
         put :update, { :id => <%= file_name %>.to_param, :<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %> }, valid_session
-        assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
+        expect(assigns(:<%= ns_file_name %>)).to eq(<%= file_name %>)
       end
 
       it "re-renders the 'edit' template" do
@@ -130,12 +130,12 @@ describe <%= controller_class_name %>Controller do
         # Trigger the behavior that occurs when invalid params are submitted
         <%= class_name %>.any_instance.stub(:save).and_return(false)
         put :update, { :id => <%= file_name %>.to_param, :<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %> }, valid_session
-        response.should render_template("edit")
+        expect(response).to render_template("edit")
       end
     end
   end
 
-  describe "DELETE destroy" do
+  describe "#destroy" do
     it "destroys the requested <%= ns_file_name %>" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
       expect {
@@ -146,7 +146,7 @@ describe <%= controller_class_name %>Controller do
     it "redirects to the <%= table_name %> list" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
       delete :destroy, { :id => <%= file_name %>.to_param }, valid_session
-      response.should redirect_to(<%= index_helper %>_url)
+      expect(response).to redirect_to(<%= index_helper %>_url)
     end
   end