Commit Graph

379 Commits

Author SHA1 Message Date
Matt Rogers
012387396a Merge pull request #1859 from robin850/rouge 2013-12-30 22:45:07 -06:00
Matt Rogers
a2fd8ba7c3 Merge pull request #1849 from afeld/sort-attributes 2013-12-30 20:31:45 -08:00
Parker Moore
1a3a607fcf Merge pull request #1831 from jekyll/default-maruku-fenced-code-blocks 2013-12-25 22:14:23 -08:00
Robin Dupret
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
Robin Dupret
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
Robin Dupret
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
Aidan Feldman
8c1706b66e clean up custom variable sort feature 2013-12-19 03:36:48 -05:00
Aidan Feldman
35712dcadc add failing test for sorting pages by custom variables 2013-12-19 03:35:57 -05:00
Aidan Feldman
396aa16f99 refactor step to support page creation 2013-12-19 02:27:23 -05:00
Aidan Feldman
5b2480c8ba refactor file+matter creation in cucumber steps 2013-12-19 01:58:46 -05:00
Jens Nazarenus
43ef9a2e4f variables in include tag with filters 2013-12-17 23:51:52 +01:00
Parker Moore
d362faea3b Add two tests for Maruku fenced code blocks 2013-12-15 16:08:45 -05:00
Matt Rogers
39b6fe732f Merge pull request #1780 from mojombo/kill-1-8 2013-12-11 06:08:10 -08:00
Parker Moore
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
Parker Moore
1297ed5c1d Remove weird 1.8.7 workarounds in features env 2013-12-06 01:42:37 -05:00
Parker Moore
5591ff2a6b Whoops, it's called 'jekyll_run_output' 2013-12-06 00:57:19 -05:00
Parker Moore
bce2c2efb4 Print the output of Jekyll if the command fails 2013-12-06 00:52:33 -05:00
Parker Moore
6187861e91 Add test code for 'whitelist' option. 2013-12-06 00:21:34 -05:00
maul.esel
f1869cda98 Merge branch 'master' into frontmatter-defaults 2013-12-05 19:29:57 +01:00
Matthew Iversen
fb9de8cbf6 Fix tests to expect maruku 0.7 output 2013-12-05 12:20:11 +11:00
Matt Rogers
9e9abcb516 Merge pull request #1448 from penibelst/replace-yoursite
Replace yoursite.com by example.com
2013-11-22 20:59:27 -08:00
Greg Karékinian
49d5c3457c Remove extra trailing whitespace 2013-11-20 00:50:56 +01:00
maul.esel
8382a8b91b add test case for variable include tag in a loop 2013-11-14 20:47:42 +01:00
Anatol Broder
4abd93567f Example FTW 2013-11-11 18:52:37 +01:00
Matt Rogers
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
Matt Rogers
fb6f8c1ff1 Merge pull request #1493 from maul-esel/feature-improvements
Improve features / tests code
2013-10-23 20:49:11 -07:00
Matt Rogers
23ad7fa4bd Merge pull request #1557 from mojombo/require-gems-plugins
Add `gems` for better plugin management
2013-10-23 07:39:43 -07:00
maul.esel
32b4de3ea6 change cucumber feature to test for precedence too 2013-10-15 13:32:49 +02:00
maul.esel
20ea0c8d56 Merge branch 'master' into frontmatter-defaults 2013-10-14 19:44:06 +02:00
maul.esel
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
maul.esel
1c52657d7d more robust cucumber features 2013-10-14 19:13:20 +02:00
maul.esel
8091029329 move cucumber features to own file 2013-10-14 16:48:26 +02:00
Juan Ignacio Donoso
e141dfa03f Add cucumber feature for layouts inside subfolders 2013-10-08 18:14:13 -03:00
Parker Moore
694599645f Add in test plugin for inclusion. 2013-10-04 15:49:47 -04:00
maul.esel
4c6ccc8009 extend feature to ensure it works with parameters as well 2013-10-01 22:31:13 +02:00
maul.esel
2138dfc0ac Fix code to allow dots in variables 2013-10-01 22:31:11 +02:00
maul.esel
50e945f251 Add a cucumber feature for variable includes 2013-10-01 22:22:50 +02:00
liufengyun
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
Parker Moore
425885460f DARN YOU RUBY 1.8.7 AND YOUR DIFFERENT TIME.TO_S METHOD 2013-09-28 14:16:57 -04:00
Parker Moore
d958fd5679 Clean it up, clean it up. 2013-09-28 13:26:55 -04:00
Parker Moore
2dd7964926 C'mon, you're a Ruby developer. What are you doing. 2013-09-27 21:56:24 -04:00
Parker Moore
aa6ee14fb7 Get some nice Regexp which is agnostic about the seconds. 2013-09-27 15:38:38 -04:00
Matt Rogers
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
maul.esel
0f4d646510 extend feature tests and use scenario outline 2013-09-16 15:19:29 +02:00
maul.esel
f606d9339b add features to test source and dest matching 2013-09-16 14:30:37 +02:00
maul.esel
b26327f20a simplify conditions for coverage reports 2013-09-14 15:28:41 +02:00
maul.esel
5ee41cd3bb setup coveralls for cucumber 2013-09-12 21:19:36 +02:00
maul.esel
f20b7d8bd2 use assert_match 2013-09-12 20:19:56 +02:00
maul.esel
2ba26f1bb6 Add basic cucumber features for frontmatter defaults 2013-09-11 00:57:49 +02:00
maul.esel
3a18157d20 rename the new function 2013-09-10 19:09:33 +02:00