minitest-spec-rails 3.1.2 → 4.3.0

data/test/dummy_app/app/controllers/users_controller.rb

@@ -5,8 +5,4 @@ class UsersController < ApplicationController
     render :layout => false
   end
 
-  def update
-    redirect_to users_url
-  end
-
 end

data/test/dummy_app/app/helpers/application_helper.rb

@@ -1,2 +1,3 @@
 module ApplicationHelper
+
 end

data/test/dummy_app/app/mailers/user_mailer.rb

@@ -0,0 +1,10 @@
+class UserMailer < ActionMailer::Base
+
+  default :from => 'rails@minitest.spec'
+
+  def welcome(user)
+    @user = user
+    mail :to => @user.email, :subject => 'Welcome', :body => "Welcome to MiniTest::Spec #{@user.email}!"
+  end
+
+end

data/test/dummy_app/app/models/user.rb

@@ -1,6 +1,3 @@
 class User < ActiveRecord::Base
 
-  has_many :posts
-
-
 end

data/test/dummy_app/config/database.yml

@@ -1,3 +1,6 @@
+
 test:
-  :adapter: sqlite3
-  :database: ":memory:"
+  adapter: sqlite3
+  database: ':memory:'
+  pool: 5
+  timeout: 5000

data/test/dummy_app/config/routes.rb

@@ -1,6 +1,4 @@
-ActionController::Routing::Routes.draw do |map|
-
-  map.resources :users
-  map.root :controller => 'application'
-
+Dummy::Application.routes.draw do
+  root :to => 'application#index'
+  resources :users
 end

data/test/dummy_app/init.rb

@@ -2,12 +2,36 @@ ENV['RAILS_ENV'] = 'test'
 require 'rubygems'
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __FILE__)
 require 'bundler/setup'
-require 'active_support/all'
-require 'action_controller'
-require 'action_view'
-require 'action_mailer'
-require 'test_help'
-require 'rails/version'
-require 'initializer'
+require 'rails/all'
 Bundler.require :default, :development, :test
-require "#{File.expand_path('../config/environment.rb', __FILE__)}"
+
+module Dummy
+  class Application < ::Rails::Application 
+
+    config.root = File.join __FILE__, '..'
+    config.cache_store = :memory_store
+    config.assets.enabled = false if Rails.version > '3.1'
+    config.secret_token = '012345678901234567890123456789'
+
+    config.whiny_nils = true if Rails.version < '4.0'
+    config.consider_all_requests_local = true
+    config.action_controller.perform_caching = false
+    config.action_dispatch.show_exceptions = false
+    config.action_controller.allow_forgery_protection = false
+    config.action_mailer.delivery_method = :test
+    config.active_support.deprecation = :stderr
+    if Rails.version < '4.0'
+      config.threadsafe!
+    else
+      config.allow_concurrency = true
+      config.cache_classes = true
+      config.dependency_loading = true
+      config.preload_frameworks = true
+      config.eager_load = true
+      config.secret_key_base = '012345678901234567890123456789'
+    end
+    
+  end
+end
+
+Dummy::Application.initialize!

data/test/dummy_tests/application_controller_test.rb

@@ -1,93 +1,49 @@
 require 'test_helper_dummy'
 
 module ApplicationControllerTests
-  def self.included(klass)
-    klass.class_eval do
+  extend ActiveSupport::Concern
+  included do
 
-      tests ApplicationController
+    it 'works' do
+      get :index
+      response.body.must_equal 'Rendered MiniTest::Spec'
+    end
 
-      before { get :index }
+    it 'allows custom assertions' do
+      assert_template :partial => false
+    end
 
-      it 'works' do
-        get :index
-        @response.body.must_equal 'Rendered MiniTest::Spec'
-      end
+    it 'can find the controller_class' do
+      self.class.controller_class.must_equal ApplicationController
+    end
 
-      it 'allows custom assertions' do
-        assert_template :partial => false
-      end
+    it 'can access the setup ivars' do
+      @controller.must_be_kind_of ApplicationController
+    end
 
-      it 'can find the controller_class' do
-        self.class.controller_class.must_equal ApplicationController
-      end
+    describe 'nested 1' do
+
+      it('works') { skip }
 
-      it 'can access the setup ivars' do
-        @controller.must_be_kind_of ApplicationController
+      it 'can find the controller_class' do
+        self.class.controller_class.must_equal ApplicationController unless rails30?
       end
 
-      describe 'nested 1' do
+      describe 'nested 2' do
 
         it('works') { skip }
 
-        it 'can find the controller_class' do
-          self.class.controller_class.must_equal ApplicationController
-        end
-
-        describe 'nested 2' do
-
-          it('works') { skip }
-
-        end
-
       end
-    
+
     end
+    
   end
 end
 
 class ApplicationControllerTest < ActionController::TestCase
   include ApplicationControllerTests
-    it 'reflects' do
-    describing_class.must_equal ApplicationControllerTest
-    described_class.must_equal ApplicationController
-    self.class.described_class.must_equal ApplicationController
-  end
-  describe 'level 1' do
-    it 'reflects' do
-      describing_class.must_equal ApplicationControllerTest
-      described_class.must_equal  ApplicationController
-      self.class.described_class.must_equal ApplicationController
-    end
-    describe 'level 2' do
-      it 'reflects' do
-        describing_class.must_equal ApplicationControllerTest
-        described_class.must_equal  ApplicationController
-        self.class.described_class.must_equal ApplicationController
-      end
-    end
-  end
 end
 
 describe ApplicationController do
   include ApplicationControllerTests
-  it 'class reflects' do
-    described_class.must_equal ApplicationController
-    self.class.described_class.must_equal ApplicationController
-  end
-  it 'reflects' do
-    described_class.must_equal ApplicationController
-    self.class.described_class.must_equal ApplicationController
-  end
-  describe 'level 1' do
-    it 'reflects' do
-      described_class.must_equal ApplicationController
-      self.class.described_class.must_equal ApplicationController
-    end
-    describe 'level 2' do
-      it 'reflects' do
-        described_class.must_equal ApplicationController
-        self.class.described_class.must_equal ApplicationController
-      end
-    end
-  end
 end

data/test/dummy_tests/integration_test.rb

@@ -1,30 +1,39 @@
 require 'test_helper_dummy'
 
 module IntegrationTests
-  def self.included(klass)
-    klass.class_eval do
+  extend ActiveSupport::Concern
+  included do
 
-      it 'works' do
-        get root_path
-        status.must_equal 200
-      end
+    fixtures :all
 
-      describe 'nested 1' do
+    it 'works' do
+      get root_path
+      status.must_equal 200
+    end
 
-        it('works') { skip }
+    it 'can find the app' do
+      app.must_be_instance_of Dummy::Application
+    end
+
+    describe 'nested 1' do
 
-        describe 'nested 2' do
+      it('works') { skip }
 
-          it('works') { skip }
+      it 'can find the app' do
+        app.must_be_instance_of Dummy::Application
+      end
+
+      describe 'nested 2' do
 
-        end
+        it('works') { skip }
 
       end
 
-    end    
+    end
+    
   end
 end
 
-class IntegrationTest < ActionController::IntegrationTest
+class IntegrationTest < ActionDispatch::IntegrationTest
   include IntegrationTests
 end

data/test/dummy_tests/user_mailer_test.rb

@@ -1,91 +1,53 @@
 require 'test_helper_dummy'
 
 module UserMailerTests
-  def self.included(klass)
-    klass.class_eval do
+  extend ActiveSupport::Concern
+  included do
+
+    let(:deliveries)        { ActionMailer::Base.deliveries }
+    let(:user_mailer_class) { UserMailer }
+    let(:user_email)        { user_mailer_class.welcome(user_ken).deliver }
+
+    it 'works' do
+      deliveries.must_be :empty?
+      user_email
+      deliveries.wont_be :empty?
+      user_email.to.must_equal    [user_ken.email]
+      user_email.from.must_equal  ['rails@minitest.spec']
+      user_email.body.encoded.must_equal "Welcome to MiniTest::Spec #{user_ken.email}!"
+    end
 
-      tests UserMailer
+    it 'allows custom assertions' do
+      assert_emails(1) { user_email }
+    end
 
-      let(:deliveries)        { ActionMailer::Base.deliveries }
-      let(:user_mailer_class) { UserMailer }
-      let(:user_email)        { user_mailer_class.deliver_welcome(user_ken) }
+    it 'can find the mailer_class' do
+      self.class.mailer_class.must_equal user_mailer_class
+    end
 
-      it 'works' do
-        deliveries.must_be :empty?
-        user_email
-        deliveries.wont_be :empty?
-        user_email.to.must_equal    [user_ken.email]
-        user_email.from.must_equal  ['rails@minitest.spec']
-        user_email.body.must_equal  "Welcome to MiniTest::Spec #{user_ken.email}!"
-      end
+    describe 'nested 1' do
 
-      it 'allows custom assertions' do
-        assert_emails(1) { user_email }
-      end
+      it('works') { skip }
 
       it 'can find the mailer_class' do
-        self.class.mailer_class.must_equal user_mailer_class
+        self.class.mailer_class.must_equal user_mailer_class unless rails30?
       end
 
-      describe 'nested 1' do
+      describe 'nested 2' do
 
         it('works') { skip }
 
-        it 'can find the mailer_class' do
-          self.class.mailer_class.must_equal user_mailer_class
-        end
-
-        describe 'nested 2' do
-
-          it('works') { skip }
-
-        end
-
       end
-    
+
     end
+    
   end
 end
 
 class UserMailerTest < ActionMailer::TestCase
   include UserMailerTests
-  it 'reflects' do
-    describing_class.must_equal UserMailerTest
-    described_class.must_equal UserMailer
-    self.class.described_class.must_equal UserMailer
-  end
-  describe 'level 1' do
-    it 'reflects' do
-      describing_class.must_equal UserMailerTest
-      described_class.must_equal  UserMailer
-      self.class.described_class.must_equal UserMailer
-    end
-    describe 'level 2' do
-      it 'reflects' do
-        describing_class.must_equal UserMailerTest
-        described_class.must_equal  UserMailer
-        self.class.described_class.must_equal UserMailer
-      end
-    end
-  end
 end
 
 describe UserMailer do
   include UserMailerTests
-  it 'reflects' do
-    described_class.must_equal UserMailer
-    self.class.described_class.must_equal UserMailer
-  end
-  describe 'level 1' do
-    it 'reflects' do
-      described_class.must_equal UserMailer
-      self.class.described_class.must_equal UserMailer
-    end
-    describe 'level 2' do
-      it 'reflects' do
-        described_class.must_equal UserMailer
-        self.class.described_class.must_equal UserMailer
-      end
-    end
-  end
 end

data/test/dummy_tests/user_test.rb

@@ -1,72 +1,36 @@
 require 'test_helper_dummy'
 
 module UserTests
-  def self.included(klass)
-    klass.class_eval do
+  extend ActiveSupport::Concern
+  included do
 
-      it 'works' do
-        user_ken.must_be_instance_of User
-      end
+    it 'works' do
+      user_ken.must_be_instance_of User
+    end
 
-      it 'allows custom assertions' do
-        assert_blank ''
-      end
+    it 'allows custom assertions' do
+      assert_blank '' if rails3?
+    end
 
-      describe 'nested 1' do
+    describe 'nested 1' do
 
-        it('works') { skip }
+      it('works') { skip }
 
-        describe 'nested 2' do
+      describe 'nested 2' do
 
-          it('works') { skip }
-
-        end
+        it('works') { skip }
 
       end
-  
+
     end
+    
   end
 end
 
 class UserTest < ActiveSupport::TestCase
   include UserTests
-  it 'reflects' do
-    describing_class.must_equal UserTest
-    described_class.must_equal User
-    self.class.described_class.must_equal User
-  end
-  describe 'level 1' do
-    it 'reflects' do
-      describing_class.must_equal UserTest
-      described_class.must_equal  User
-      self.class.described_class.must_equal User
-    end
-    describe 'level 2' do
-      it 'reflects' do
-        describing_class.must_equal UserTest
-        described_class.must_equal  User
-        self.class.described_class.must_equal User
-      end
-    end
-  end
 end
 
 describe User do
   include UserTests
-  it 'reflects' do
-    described_class.must_equal User
-    self.class.described_class.must_equal User
-  end
-  describe 'level 1' do
-    it 'reflects' do
-      described_class.must_equal User
-      self.class.described_class.must_equal User
-    end
-    describe 'level 2' do
-      it 'reflects' do
-        described_class.must_equal User
-        self.class.described_class.must_equal User
-      end
-    end
-  end
 end