Skip to content

Commit

Permalink
Merge branch 'wbyoung-pass-test-suite'
Browse files Browse the repository at this point in the history
  • Loading branch information
amatsuda committed Nov 9, 2013
2 parents 569c83f + be7ba2d commit 32fb711
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 5 deletions.
20 changes: 20 additions & 0 deletions spec/fake_app/engine/lib/engine.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
module Engine
class Engine < ::Rails::Engine
isolate_namespace ::Engine
end
end

Engine::Engine.routes.draw do
resources :users
end

# controllers
class Engine::UsersController < ::ApplicationController
def index
@users = User.page(params[:page]).per(3)
render :inline => <<-ERB
<%= @users.map(&:name).join("\n") %>
<%= paginate @users %>
ERB
end
end
16 changes: 11 additions & 5 deletions spec/fake_app/rails_app.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@
Rails.backtrace_cleaner.remove_silencers!
app.initialize!

# routes
app.routes.draw do
resources :users
end

#models
require 'fake_app/active_record/models' if defined? ActiveRecord
require 'fake_app/data_mapper/models' if defined? DataMapper
Expand Down Expand Up @@ -54,3 +49,14 @@ def index

# helpers
Object.const_set(:ApplicationHelper, Module.new)

# routes
app.routes.draw do
resources :users

if Rails.version > '3.1.0'
$LOAD_PATH << File.join(File.dirname(__FILE__), 'engine/lib')
require 'engine'
mount Engine::Engine => '/engine'
end
end
26 changes: 26 additions & 0 deletions spec/requests/engine_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# encoding: UTF-8
require 'spec_helper'

feature 'Pagination properly works in mouted Engines' do
background do
1.upto(10) {|i| User.create! :name => "user#{'%02d' % i}" }
end
scenario 'Showing normal pagination links' do
visit '/engine/users'

within 'nav.pagination' do
within 'span.page.current' do
page.should have_content '1'
end
within 'span.next' do
click_link 'Next ›'
end
end

within 'nav.pagination' do
within 'span.page.current' do
page.should have_content '2'
end
end
end
end if Rails.version > '3.1.0'

0 comments on commit 32fb711

Please sign in to comment.