fix slickmap, change to config.rb, rename Base to Server
This commit is contained in:
parent
b5697d9b0d
commit
8b00e830f9
34 changed files with 311 additions and 291 deletions
|
@ -1,13 +1,13 @@
|
|||
Given /^page "([^\"]*)" has layout "([^\"]*)"$/ do |url, layout|
|
||||
Middleman::Base.set :root, File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "spec", "fixtures", "sample")
|
||||
Middleman::Base.page(url, :layout => layout.to_sym)
|
||||
@browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Base.new))
|
||||
Middleman::Server.set :root, File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "spec", "fixtures", "sample")
|
||||
Middleman::Server.page(url, :layout => layout.to_sym)
|
||||
@browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Server.new))
|
||||
end
|
||||
|
||||
Given /^"([^\"]*)" with_layout block has layout "([^\"]*)"$/ do |url, layout|
|
||||
Middleman::Base.set :root, File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "spec", "fixtures", "sample")
|
||||
Middleman::Base.with_layout(:layout => layout.to_sym) do
|
||||
Middleman::Server.set :root, File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "spec", "fixtures", "sample")
|
||||
Middleman::Server.with_layout(:layout => layout.to_sym) do
|
||||
page(url)
|
||||
end
|
||||
@browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Base.new))
|
||||
@browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Server.new))
|
||||
end
|
Loading…
Add table
Add a link
Reference in a new issue