Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ gemfile:

bundler_args: ''

# for the rails 2.3 test app.
before_install:
- ruby -e "exit(RUBY_VERSION.to_f >= 2.0)" || gem update --system 1.8.25
- gem --version

before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
Expand All @@ -45,7 +40,6 @@ script: "bundle exec rake test:ci"
#
## For all the integration tests
env:
- RAILS_VERSION=2.3
- RAILS_VERSION=3.0
- RAILS_VERSION=3.1
- RAILS_VERSION=3.2
Expand All @@ -56,29 +50,21 @@ env:

matrix:
exclude:
- rvm: 2.0.0
env: RAILS_VERSION=2.3
- rvm: 2.0.0
env: RAILS_VERSION=3.0
- rvm: 2.0.0
env: RAILS_VERSION=3.1

- rvm: 2.1.2
env: RAILS_VERSION=2.3
- rvm: 2.1.2
env: RAILS_VERSION=3.0
- rvm: 2.1.2
env: RAILS_VERSION=3.1

- rvm: 2.2.0
env: RAILS_VERSION=2.3
- rvm: 2.2.0
env: RAILS_VERSION=3.0
- rvm: 2.2.0
env: RAILS_VERSION=3.1

- rvm: ruby-head
env: RAILS_VERSION=2.3
- rvm: ruby-head
env: RAILS_VERSION=3.0
- rvm: ruby-head
Expand Down
2 changes: 0 additions & 2 deletions etc/aepos.dot
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ digraph classes {
#<Class_0x007fb6b9d555f8> [label=""]
AePageObjects__ApplicationRouter [label="AePageObjects::ApplicationRouter"]
AePageObjects__ApplicationRouter__Recognizer__Base [label="AePageObjects::ApplicationRouter::Recognizer::Base"]
AePageObjects__ApplicationRouter__Recognizer__Rails23 [label="AePageObjects::ApplicationRouter::Recognizer::Rails23"]
AePageObjects__ApplicationRouter__Recognizer__Rails3 [label="AePageObjects::ApplicationRouter::Recognizer::Rails3"]
AePageObjects__ApplicationRouter__Recognizer__Rails32 [label="AePageObjects::ApplicationRouter::Recognizer::Rails32"]
AePageObjects__ApplicationRouter__Recognizer__Rails4 [label="AePageObjects::ApplicationRouter::Recognizer::Rails4"]
Expand Down Expand Up @@ -61,7 +60,6 @@ digraph classes {
#<Class_0x007fb6b9d555f8> -> Struct
AePageObjects__ApplicationRouter -> AePageObjects__BasicRouter
AePageObjects__ApplicationRouter__Recognizer__Base -> Object
AePageObjects__ApplicationRouter__Recognizer__Rails23 -> AePageObjects__ApplicationRouter__Recognizer__Base
AePageObjects__ApplicationRouter__Recognizer__Rails3 -> AePageObjects__ApplicationRouter__Recognizer__Base
AePageObjects__ApplicationRouter__Recognizer__Rails32 -> AePageObjects__ApplicationRouter__Recognizer__Rails3
AePageObjects__ApplicationRouter__Recognizer__Rails4 -> AePageObjects__ApplicationRouter__Recognizer__Rails32
Expand Down
Binary file modified etc/aepos.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 1 addition & 26 deletions lib/ae_page_objects/core/application_router.rb
Original file line number Diff line number Diff line change
Expand Up @@ -58,29 +58,6 @@ def resolve_url(url, method)
ResolvedRoute = Struct.new(:controller, :action)
end

class Rails23 < Base

private

def routes
@routes ||= begin
routes_class = Class.new do
include ActionController::UrlWriter
end
ActionController::Routing::Routes.install_helpers(routes_class)
routes_class.new
end
end

def normalize_url(url)
url
end

def router
ActionController::Routing::Routes
end
end

class Rails3 < Base

private
Expand Down Expand Up @@ -155,9 +132,7 @@ def generate_path(named_route, *args)

def recognizer
@recognizer ||= begin
if ::Rails.version =~ /\A2\.3/
Recognizer::Rails23.new
elsif ::Rails.version =~ /\A3\.[01]/
if ::Rails.version =~ /\A3\.[01]/
Recognizer::Rails3.new
elsif ::Rails.version =~ /\A3\.2/
Recognizer::Rails32.new
Expand Down
16 changes: 0 additions & 16 deletions test/test_apps/2.3/Appraisals

This file was deleted.

14 changes: 0 additions & 14 deletions test/test_apps/2.3/Gemfile

This file was deleted.

24 changes: 0 additions & 24 deletions test/test_apps/2.3/Rakefile

This file was deleted.

This file was deleted.

91 changes: 0 additions & 91 deletions test/test_apps/2.3/app/controllers/authors_controller.rb

This file was deleted.

86 changes: 0 additions & 86 deletions test/test_apps/2.3/app/controllers/books_controller.rb

This file was deleted.

Loading