diff --git a/spec/fake_app/engine/lib/engine.rb b/spec/fake_app/engine/lib/engine.rb deleted file mode 100644 index fbca045..0000000 --- a/spec/fake_app/engine/lib/engine.rb +++ /dev/null @@ -1,20 +0,0 @@ -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 diff --git a/spec/fake_app/rails_app.rb b/spec/fake_app/rails_app.rb index 36b1b6a..6180331 100644 --- a/spec/fake_app/rails_app.rb +++ b/spec/fake_app/rails_app.rb @@ -17,6 +17,11 @@ app.config.root = File.dirname(__FILE__) 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 @@ -49,14 +54,3 @@ end # 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 diff --git a/spec/requests/engine_spec.rb b/spec/requests/engine_spec.rb deleted file mode 100644 index ec45f09..0000000 --- a/spec/requests/engine_spec.rb +++ /dev/null @@ -1,26 +0,0 @@ -# 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'