deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Tests and a small bug fix to make them pass

Browse source
This commit is contained in:
Tim Bates 2012-07-13 16:00:53 +09:30
parent 3cbda0ee36
commit 0fa1bfe675
6 changed files with 44 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
middleman-core/features/strip_url.feature Normal file
View file

@ -0,0 +1,40 @@
Feature: Strip the index_file from urls
Scenario: Default behaviour, strip with trailing slash
Given the Server is running at "strip-url-app"
When I go to "/"
Then I should see "URL: '/'"
When I go to "/index.html"
Then I should see "URL: '/'"
When I go to "/other.html"
Then I should see "URL: '/other.html'"
When I go to "/subdir/index.html"
Then I should see "URL: '/subdir/'"
Scenario: Trailing slash off
Given a fixture app "strip-url-app"
And a file named "config.rb" with:
"""
set :trailing_slash, false
"""
And the Server is running
When I go to "/"
Then I should see "URL: '/'"
When I go to "/other.html"
Then I should see "URL: '/other.html'"
When I go to "/subdir/index.html"
Then I should see "URL: '/subdir'"
Scenario: Strip index off
Given a fixture app "strip-url-app"
And a file named "config.rb" with:
"""
set :strip_index_file, false
"""
And the Server is running
When I go to "/"
Then I should see "URL: '/index.html'"
When I go to "/other.html"
Then I should see "URL: '/other.html'"
When I go to "/subdir/index.html"
Then I should see "URL: '/subdir/index.html'"

0
middleman-core/fixtures/strip-url-app/config.rb Normal file
View file

1
middleman-core/fixtures/strip-url-app/source/index.html.erb Executable file
View file

@ -0,0 +1 @@
URL: '<%= current_page.url %>'

1
middleman-core/fixtures/strip-url-app/source/other.html.erb Executable file
View file

@ -0,0 +1 @@
URL: '<%= current_page.url %>'

1
middleman-core/fixtures/strip-url-app/source/subdir/index.html.erb Executable file
View file

@ -0,0 +1 @@
URL: '<%= current_page.url %>'

2
middleman-core/lib/middleman-core/sitemap/resource.rb
View file

@ -143,7 +143,7 @@ module Middleman
def url
url_path = destination_path
if app.strip_index_file
url_path = url_path.sub(/\/#{Regexp.escape(app.index_file)}$/,
url_path = url_path.sub(/(^|\/)#{Regexp.escape(app.index_file)}$/,
app.trailing_slash ? '/' : '')
end
File.join(app.respond_to?(:http_prefix) ? app.http_prefix : '/', url_path)