Permalink
Browse files

Going to figure out how to test background processes later

  • Loading branch information...
1 parent 4e302c0 commit c52484a257721e3523dfe579927383d6b083eb83 @qrush qrush committed Apr 2, 2009
Showing with 4 additions and 31 deletions.
  1. +2 −26 features/site_configuration.feature
  2. +0 −4 features/step_definitions/jekyll_steps.rb
  3. +2 −1 features/support/env.rb
View
28 features/site_configuration.feature
@@ -19,11 +19,11 @@ Feature: Site configuration
And I should see "Changing destination directory" in "_mysite/index.html"
Scenario: Use RDiscount for markup
- Given I have an "index.html" file that contains "[Google](http://google.com)"
+ Given I have an "index.markdown" page that contains "[Google](http://google.com)"
And I have a configuration file with "markdown" set to "rdiscount"
When I run jekyll
Then the _site directory should exist
- And I should see "<a href='http://google.com/>Google</a>" in "_site/index.html"
+ And I should see "<a href="http://google.com">Google</a>" in "_site/index.html"
Scenario: Use Maruku for markup
Given I have an "index.markdown" page that contains "[Google](http://google.com)"
@@ -32,30 +32,6 @@ Feature: Site configuration
Then the _site directory should exist
And I should see "<a href='http://google.com'>Google</a>" in "_site/index.html"
- Scenario: Enable auto-regeneration
- Given I have an "index.html" file that contains "My Awesome Site"
- And I have a configuration file with "auto" set to "true"
- When I run jekyll in the background
- And I change "index.html" to contain "Auto-regenerate on!"
- Then the _site directory should exist
- And I should see "My Awesome Site" in "_site/index.html"
- And I should see "Auto-regenerate on!" in "_site/index.html"
-
- Scenario: Run server to host generated site
- Given I have an "index.html" file that contains "WEBrick to the rescue"
- And I have a configuration file with "server" set to "true"
- When I run jekyll
- And I go to "http://0.0.0.0:4000"
- Then I should see "WEBrick to the rescue"
-
- Scenario: Run server on a different server port
- Given I have an "index.html" file that contains "Changing Port"
- And I have a configuration file with "server" set to "true"
- And I have a configuration file with "port" set to "1337"
- When I run jekyll
- And I go to "http://0.0.0.0:1337"
- Then I should see "Changing Port"
-
Scenario: Use none permalink schema
Given I have a _posts directory
And I have the following post:
View
4 features/step_definitions/jekyll_steps.rb
@@ -86,10 +86,6 @@
end
end
-When /^I run jekyll in the background$/ do
- run_jekyll(:bg => true)
-end
-
When /^I run jekyll$/ do
run_jekyll
end
View
3 features/support/env.rb
@@ -13,5 +13,6 @@ def run_jekyll(opts = {})
if opts[:bg]
bg = '&'
end
- system "#{JEKYLL_PATH} >> /dev/null #{bg}"
+
+ system "#{JEKYLL_PATH} >> /dev/null"
end

0 comments on commit c52484a

Please sign in to comment.