6bd07501e8
Merge branch 'frontmatter-defaults' of git://github.com/maul-esel/jekyll into maul-esel-frontmatter-defaults
...
* 'frontmatter-defaults' of git://github.com/maul-esel/jekyll:
move self.type to convertible
oops, fix minor indentation quirk
document frontmatter defaults precedence
adjust frontmatter defaults precedence handling
change cucumber feature to test for precedence too
fix frontmatter defaults for custom paths
more robust cucumber features
fix slash handling for paths
move cucumber features to own file
fix minor docs quirk
improve path checking, now using Pathname instead of regex
Add site documentation for the new feature
add inline code docs
improve validation code
fix for Ruby 1.8
Add basic cucumber features for frontmatter defaults
Retrieve frontmatter defaults when retrieved internally
make frontmatter defaults available to liquid
add a class `FrontmatterDefaults` for handling of frontmatter defaults
Add a method to retrieve type to post, page and draft
Conflicts:
lib/jekyll.rb
lib/jekyll/convertible.rb
lib/jekyll/core_ext.rb
lib/jekyll/page.rb
lib/jekyll/post.rb
2014-04-04 15:32:27 -04:00
81e4e1d8f4
add support for unpublished drafts
...
I keep all my ideas for blog posts as drafts in my draft folder. However I'm
only really working on a couple at once. This let's me mark drafts that I'm
not working on right now as unpublished so they don't clutter the site while
I'm checking on the other drafts.
2014-03-22 19:52:10 -04:00
53c42d000f
Move test dir to inside tmp in this repo.
2014-03-18 23:53:31 -04:00
6eef4b65ff
Remove redundant whitespace in a Cucumber feature
2014-03-01 23:32:30 +04:00
2f79262f80
Fix tables alignments in Cucumber features
2014-03-01 23:10:05 +04:00
18279558da
Update #relative_path for _drafts and add tests.
...
Resolves #2019 . Add new tests for drafts. Also check path variable in
test for posts.
2014-02-11 12:48:34 +00:00
22f2001ff5
Set default markdown converter to Kramdown
...
- Update default markdown converter in docs for configuration
- Update tests so they are in line with Kramdown output
- Add deprecation message to when config is built
2014-02-08 13:17:46 -05:00
012387396a
Merge pull request #1859 from robin850/rouge
2013-12-30 22:45:07 -06:00
a2fd8ba7c3
Merge pull request #1849 from afeld/sort-attributes
2013-12-30 20:31:45 -08:00
1a3a607fcf
Merge pull request #1831 from jekyll/default-maruku-fenced-code-blocks
2013-12-25 22:14:23 -08:00
5647a902de
Remove a useless given step
...
Since the highlighter configuration option should default to pygments,
we don't have to explicitly set it in the step testing the output with
pygments.
2013-12-23 13:03:29 +01:00
0831d2b0f8
Add support for the Rouge syntax highlighter
...
By setting the `highlighter` setting to `rouge` you can now easily
highlight your code with it instead of relying on Pygments. However,
Jekyll doesn't depend on Rouge explicitly, you will need to install it
or add it to your Gemfile.
The documentation has been updated accordingly.
2013-12-22 18:45:40 +01:00
903cce2745
Fix the highlight tag feature
...
Previously, the assertion made wasn't enough to check whether the code
block was correctly parsed through Pygments (and it was not the case).
This commit simply ensure there is a div with the "highlight" class and
fix the test to correctly invoke the Liquid tag rendering.
2013-12-22 12:29:19 +01:00
8c1706b66e
clean up custom variable sort feature
2013-12-19 03:36:48 -05:00
35712dcadc
add failing test for sorting pages by custom variables
2013-12-19 03:35:57 -05:00
396aa16f99
refactor step to support page creation
2013-12-19 02:27:23 -05:00
5b2480c8ba
refactor file+matter creation in cucumber steps
2013-12-19 01:58:46 -05:00
43ef9a2e4f
variables in include tag with filters
2013-12-17 23:51:52 +01:00
d362faea3b
Add two tests for Maruku fenced code blocks
2013-12-15 16:08:45 -05:00
39b6fe732f
Merge pull request #1780 from mojombo/kill-1-8
2013-12-11 06:08:10 -08:00
b58cd5c132
Merge pull request #1657 from mojombo/safe-whitelist
...
A gem-based plugin whitelist for `safe` mode
2013-12-07 21:41:55 -08:00
1297ed5c1d
Remove weird 1.8.7 workarounds in features env
2013-12-06 01:42:37 -05:00
5591ff2a6b
Whoops, it's called 'jekyll_run_output'
2013-12-06 00:57:19 -05:00
bce2c2efb4
Print the output of Jekyll if the command fails
2013-12-06 00:52:33 -05:00
6187861e91
Add test code for 'whitelist' option.
2013-12-06 00:21:34 -05:00
f1869cda98
Merge branch 'master' into frontmatter-defaults
2013-12-05 19:29:57 +01:00
fb9de8cbf6
Fix tests to expect maruku 0.7 output
2013-12-05 12:20:11 +11:00
9e9abcb516
Merge pull request #1448 from penibelst/replace-yoursite
...
Replace yoursite.com by example.com
2013-11-22 20:59:27 -08:00
49d5c3457c
Remove extra trailing whitespace
2013-11-20 00:50:56 +01:00
8382a8b91b
add test case for variable include tag in a loop
2013-11-14 20:47:42 +01:00
4abd93567f
Example FTW
2013-11-11 18:52:37 +01:00
bd825924b2
Merge pull request #1582 from mojombo/seconds_agnostic_time
...
Get some nice Regexp which is agnostic about the seconds.
2013-10-23 22:57:18 -05:00
fb6f8c1ff1
Merge pull request #1493 from maul-esel/feature-improvements
...
Improve features / tests code
2013-10-23 20:49:11 -07:00
23ad7fa4bd
Merge pull request #1557 from mojombo/require-gems-plugins
...
Add `gems` for better plugin management
2013-10-23 07:39:43 -07:00
32b4de3ea6
change cucumber feature to test for precedence too
2013-10-15 13:32:49 +02:00
20ea0c8d56
Merge branch 'master' into frontmatter-defaults
2013-10-14 19:44:06 +02:00
699eeba9f0
fix frontmatter defaults for custom paths
...
The Page#path or Post#path can be overriden by by a frontmatter
setting. This causes path-based frontmatter default detection to
fail. Add test to demonstrate this and fix it.
2013-10-14 19:16:53 +02:00
1c52657d7d
more robust cucumber features
2013-10-14 19:13:20 +02:00
8091029329
move cucumber features to own file
2013-10-14 16:48:26 +02:00
e141dfa03f
Add cucumber feature for layouts inside subfolders
2013-10-08 18:14:13 -03:00
694599645f
Add in test plugin for inclusion.
2013-10-04 15:49:47 -04:00
4c6ccc8009
extend feature to ensure it works with parameters as well
2013-10-01 22:31:13 +02:00
2138dfc0ac
Fix code to allow dots in variables
2013-10-01 22:31:11 +02:00
50e945f251
Add a cucumber feature for variable includes
2013-10-01 22:22:50 +02:00
760cbc7f91
Autoload yaml files under _data directory
...
The jekyll engine will autoload all yaml files(ends with .yml or .yaml)
under _data. If there's a file members.yml under the directory, then user
can access contents of the file through site.members.
2013-10-01 11:23:33 +08:00
425885460f
DARN YOU RUBY 1.8.7 AND YOUR DIFFERENT TIME.TO_S METHOD
2013-09-28 14:16:57 -04:00
d958fd5679
Clean it up, clean it up.
2013-09-28 13:26:55 -04:00
2dd7964926
C'mon, you're a Ruby developer. What are you doing.
2013-09-27 21:56:24 -04:00
aa6ee14fb7
Get some nice Regexp which is agnostic about the seconds.
2013-09-27 15:38:38 -04:00
de49342324
Merge pull request #1556 from maul-esel/dest-match
...
Fix up matching against source and destination when the two locations are similar.
2013-09-16 18:34:22 -07:00
0f4d646510
extend feature tests and use scenario outline
2013-09-16 15:19:29 +02:00
f606d9339b
add features to test source and dest matching
2013-09-16 14:30:37 +02:00
b26327f20a
simplify conditions for coverage reports
2013-09-14 15:28:41 +02:00
5ee41cd3bb
setup coveralls for cucumber
2013-09-12 21:19:36 +02:00
f20b7d8bd2
use assert_match
2013-09-12 20:19:56 +02:00
2ba26f1bb6
Add basic cucumber features for frontmatter defaults
2013-09-11 00:57:49 +02:00
3a18157d20
rename the new function
2013-09-10 19:09:33 +02:00
89f0d69b07
Revert to #readlines#join, but enclose it in a function
...
This is necessary to preserve the handling
of \r\n and \n line endings.
2013-09-07 18:07:54 +02:00
be54303fa9
Use File#read instead of #readlines.join construct
2013-09-02 14:00:58 +02:00
4fafdfccf3
Add cucumber test for `jekyll.version`.
2013-08-30 18:59:35 -04:00
9e11a7f35f
Fix date format in permalink.features.
2013-08-11 12:40:28 +02:00
d4300be758
Merge branch 'permalink-no-dir' of git://github.com/maul-esel/jekyll into maul-esel-permalink-no-dir
...
* 'permalink-no-dir' of git://github.com/maul-esel/jekyll:
test per-post permalinks
do not force the permalink to be a dir if it ends on .html
Conflicts:
features/step_definitions/jekyll_steps.rb
2013-08-11 12:08:56 +02:00
a62d868c74
s/sitej/site/ props @benbalter
2013-07-22 14:57:44 +02:00
5d6b755d7d
feature maybe?
2013-07-22 13:42:40 +02:00
08f6f3c2ed
Merge pull request #1204 from maul-esel/include-params2
...
Support parameters for liquid include tags.
2013-07-09 14:14:40 -07:00
2484833bc8
Merge pull request #1118 from maul-esel/dir-bug-take2
...
[bugfix #417 ] delete old files that have been replaced by a directory
2013-07-01 07:52:29 -07:00
fdebe492cc
Merge pull request #1171 from zachgersh/new_empty
...
Added a --blank command which scaffolds empty files.
2013-06-24 22:25:25 -07:00
656dcca3d2
Add a cucumber test for passing variables
2013-06-22 15:47:59 +02:00
270ad54eb3
Removed extra steps and refactored my tests thanks to Maul.
2013-06-18 07:57:59 -07:00
eb06cf0d3d
Adding back the removal of the TEST_DIR. Thanks to sharp eyes.
2013-06-18 07:57:59 -07:00
44cfa0540f
Switch it to file.exists? and File.directory? so 1.8.7 doesn't complain.
2013-06-18 07:57:59 -07:00
3fdeb8c591
Fixed my tests, I need more specific tests for the new command.
2013-06-18 07:57:59 -07:00
b19997aee4
Broken test committed. Can't find proper directories.
2013-06-18 07:57:59 -07:00
7fba828f02
The start of something cucumber.
2013-06-18 07:57:59 -07:00
53dec6a4f6
add single-quote cucumber testing
2013-06-13 18:39:00 +02:00
1e15df0701
fix cucumber feature to obey new date format
2013-06-11 16:28:50 +02:00
73e589df56
add a cucumber feature for passing parameters to includes
2013-06-11 16:04:42 +02:00
a71b755e9e
Remove superfluous "After" block from step defintions.
2013-06-09 18:31:09 +02:00
ce3fa7fd02
Add feature to test new functionality.
2013-06-09 18:31:08 +02:00
a75b4a865d
Merge pull request #1151 from jpiasetz/refactors-steps
...
Combined layout and theme features into one
2013-06-08 10:46:13 -07:00
240bcccd2f
Remove extra parentheses and swapped regex back
2013-05-25 16:32:36 -04:00
54d7ac6e33
Combined two features into one
2013-05-25 11:45:30 -04:00
72fa7f8a73
Switch cucumber features to use iso dates
2013-05-25 11:35:28 -04:00
4b6baf01cb
Merge pull request #1139 from scribu/cucumber-fix
...
Fix for #622 (Cucumber infinite loop)
2013-05-23 14:28:31 -07:00
e043c419f5
Trying to edit my history to remove the mistakes
2013-05-23 16:49:43 -04:00
c4750cf48f
Fixes so that the timezone gets written when it explicit is specificied in a test
2013-05-23 14:04:22 -04:00
6936bbded8
Changed the jekyll steps to write only the date and time for tests. This avoids timezone issues.
2013-05-23 14:04:22 -04:00
7579c1c42d
cucumber: don't manually include assertions
...
It causes hard to debug infinite loops and it's done automatically
in recent versions of Cucumber anyway.
2013-05-23 20:35:27 +03:00
45576a39a6
test this fix with a cucumber feature
2013-05-18 22:30:03 +02:00
151ffab6fe
Removed space characters in empty lines
2013-05-16 20:27:27 +02:00
2d0e65b5f7
In Cucumber step definitions, it'd be smart not to chdir into a dir we're about to kill
2013-05-05 17:25:42 +02:00
5836b441f6
Fixing up pagination feature test
2013-05-05 17:25:09 +02:00
457e90fd41
Just remove the darn TEST_DIR
2013-04-15 15:42:21 +02:00
aa1f52fce8
Renamed timezone feature scenarios
2013-04-15 14:35:28 +02:00
83cb01dd59
Using File.exists? more generally instead of File.directory? so /tmp/jekyll is always removed before running tests
2013-04-15 14:34:06 +02:00
88e68e038a
Extract out date parsing in feature steps
2013-04-15 14:32:14 +02:00
9c57fad430
Finished feature for timezone shifting.
2013-04-15 00:42:14 +02:00
df868b308a
Set Jekyll path relative to the env file, not to CWD
2013-04-15 00:42:14 +02:00
48795462c2
Cucumber: remove test dir if it's there
2013-04-15 00:42:14 +02:00
b51b796a1e
Feature for timezone switching
2013-04-15 00:42:13 +02:00
Parker Moore
Daniel Schauenberg
Slava Pavlutin
Anthony Smith
Matt Rogers
Robin Dupret
Aidan Feldman
Jens Nazarenus
maul.esel
Matthew Iversen
Greg Karékinian
Anatol Broder
Juan Ignacio Donoso
liufengyun
zachgersh
John Piasetzki
scribu
Sebastian Morr