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

Merge remote-tracking branch 'origin/3.0-stable'

Browse source 
Conflicts:
	CHANGELOG.md
	middleman-core/lib/middleman-core/cli/build.rb
	middleman-core/lib/middleman-core/core_extensions/rendering.rb
	middleman-core/lib/middleman-core/preview_server.rb
	middleman-core/lib/middleman-core/renderers/sass.rb
	middleman-core/lib/middleman-core/sitemap/store.rb
	middleman-core/lib/middleman-core/util.rb
	middleman-core/lib/middleman-core/version.rb
	middleman-more/lib/middleman-more/core_extensions/compass.rb
	middleman-more/lib/middleman-more/core_extensions/default_helpers.rb
	middleman-more/lib/middleman-more/extensions/asset_hash.rb
This commit is contained in:
Ben Hollis 2013-01-25 21:43:30 -08:00
commit c0c14f4eab
15 changed files with 122 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
middleman-core/features/missing-tilt-lib.feature Normal file
View file

@ -0,0 +1,20 @@
Feature: Tilt missing support libraries
Scenario: Rendering Textile and Wiki files
Given the Server is running at "missing-tilt-library-app"
When I go to "/danger-zone/more-wiki.html.wiki"
Then I should see "File Not Found"
When I go to "/danger-zone/more-wiki.html"
Then I should see "File Not Found"
When I go to "/safe-zone/my-wiki.html.wiki"
Then I should see "Safe"
When I go to "/safe-zone/my-wiki.html"
Then I should see "File Not Found"
When I go to "/textile-source.html.textile"
Then I should see "File Not Found"
When I go to "/textile-source.html"
Then I should see "File Not Found"
When I go to "/wiki-source.html.wiki"
Then I should see "Hola"
When I go to "/wiki-source.html"
Then I should see "File Not Found"