Commit Graph

499 Commits

Author SHA1 Message Date
Parker Moore ac8d8a7cb8 Fix some tests 2014-02-08 00:31:26 -05:00
Matt Rogers & Persa Zula facf115c04 Move layout tests from site to its own file 2014-02-06 22:45:51 -06:00
Parker Moore f638fb1784 Merge master into security-vuln-patches 2014-02-06 17:21:54 -05:00
Anatol Broder 487e7a7137 Make sort test run 2014-02-04 09:23:00 +01:00
Anatol Broder 9e4dea14e4 Fix partial test 2014-02-04 02:03:14 +01:00
Anatol Broder 8e0a826cc7 Fix group_by_filter test by adding 2 items 2014-02-04 01:31:37 +01:00
Anatol Broder e36f9d7da8 First draft 2014-02-04 01:26:28 +01:00
Matt Rogers 5edb4c6bfd Merge pull request #1982 from dtao/safe-yaml-no-clobber 2014-01-31 06:48:16 -08:00
Parker Moore fdbfd719ca Add CoffeeScript converter. 2014-01-25 20:38:51 -05:00
Matt Rogers 5b7a53b543 Merge pull request #1932 from jekyll/sass 2014-01-24 15:18:06 -08:00
Parker Moore 774bf96c61 Merge master into sass 2014-01-24 12:17:35 -05:00
Dan Tao fafacef0a0 added a test that YAML.load doesn't get clobbered
I THINK this is a good idea? I considered multiple approaches to testing this;
what I like about this dumb way (just try to deserialize a symbol) is that it's
nice and simple.
2014-01-23 17:42:14 -08:00
Dan Tao 4f0b1bdf6d switched from YAML.safe_load* to SafeYAML.load* 2014-01-23 17:25:17 -08:00
Matt Rogers 98857832cd Merge pull request #1931 from liufengyun/published 2014-01-22 05:38:04 -08:00
liufengyun 22e1e5f28c make sure pages with published being false are not generated 2014-01-19 09:52:19 +08:00
Jens Nazarenus 82bee23bd0 added tests for full path leak to source directory when using include tag 2014-01-16 18:43:25 +01:00
Matt Rogers 10e5ecfe53 Improve the test description for the outputs_ext test 2014-01-15 23:04:52 -06:00
Matt Rogers 824d9f6ca8 Better express that the converter always outputs css 2014-01-15 22:49:33 -06:00
Ben Balter e3be74e376 sanity check for pages permalink traversal
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
Andy Lindeman a8dd34420b Prevents disclosure of file existence
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
Ben Balter c84cb5c007 escape relative post permalinks, cleanup
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
Ben Balter a799e41b70 patch symlink vuln and properly test
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
Ben Balter 4e318cd192 test symlinkd dir, not file
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
Ben Balter ce425eec8b fix symlink so tests fail
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
Ben Balter f570a9339d unbreak tests
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
Ben Balter dfec551cc4 add symlink failing test
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
Ben Balter 0acbe95797 test multiple traversals
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
Ben Balter f49ee21136 fix failing post count test
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
Ben Balter 9b3068c15d url escape before sanitizing
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
Ben Balter 9e796d0627 failing test
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
Parker Moore 2966606b1a Add docs about the 'new' restriction on excludes. 2014-01-13 00:17:12 -08:00
Parker Moore 4afe39e461 Allow caching in unsafe mode, but disable in safe mode. 2014-01-12 21:36:08 -08:00
Parker Moore ecf85a9cfa Does not allow caching.
This was done to prevent putting the .sass-cache folder in bad places. Needed? cc @benbalter.
2014-01-12 21:30:30 -08:00
Parker Moore 8ecd2d9218 Don't allow path traversal or syntax overrides. 2014-01-12 21:30:30 -08:00
Parker Moore 4784d1de18 Build Sass configuration options. 2014-01-12 21:30:30 -08:00
Parker Moore 22d4e2aa90 Consolidate into one master 'Sass' converter. 2014-01-12 21:30:29 -08:00
Parker Moore 4da7223831 Fixes for Sass/SCSS converters. 2014-01-12 21:30:29 -08:00
Parker Moore 331c7adc08 Move #glob_include? from core_ext to entry_filter 2014-01-08 20:24:21 -08:00
Parker Moore 366f9268ee Add tests for new exclude behaviour. 2014-01-05 11:01:51 -08:00
Parker Moore a5f1bc0341 Fixed the tests... I guess Hash literals aren't ok. 2014-01-03 21:23:02 -08:00
Parker Moore b4383a5c42 Flesh out tests for where filter for @mattr- 😃 2014-01-03 21:23:02 -08:00
Ben Balter 39e4d6b3ba add where filter to filter arrays of objects 2014-01-03 21:23:02 -08:00
Parker Moore c7b649f792 Update test_generated_site.rb to know about new post 2014-01-01 19:53:42 -08:00
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
Meeka 1da8f04aaa Removes assert_includes to pass Travis 2013-12-30 12:57:23 -05:00
Meeka 9652b7ef80 adds to_s method testing on Excerpt 2013-12-30 12:23:41 -05:00
Meeka 3a0733deb9 Adds tests for the Excerpt include?, id, and inspect methods 2013-12-30 12:15:13 -05:00
Parker Moore 791c6d815d Merge pull request #1825 from arika/smallfix_post_url_tag_behavior_for_invalid_names 2013-12-25 22:32:50 -08:00
Parker Moore 6e8f31f406 Merge pull request #1841 from jens-na/include-variable-liquid-filters 2013-12-25 22:11:33 -08:00
Parker Moore c70350e275 Merge branch 'steal-envygeeks-custom-markdown-processors' of git://github.com/gjtorikian/jekyll into gjtorikian-steal-envygeeks-custom-markdown-processors
* 'steal-envygeeks-custom-markdown-processors' of git://github.com/gjtorikian/jekyll:
  Depend on Jekyll.logger.error, not $stderr
  Allow custom Markdown processors.
  New is implied by `raise`, 2nd is the message.
  Use $stderr, not STDERR, $stderr points to STDERR.
2013-12-25 23:52:50 -05:00
Jordon c759a7a75f Allow custom Markdown processors. 2013-12-25 19:36:25 -06:00
Aidan Feldman 9d7c524530 fix file sorting test 2013-12-22 19:33:00 -05:00
Aidan Feldman fa8618879d Merge remote-tracking branch 'upstream/master' into sort-attributes 2013-12-22 19:31:56 -05:00
Robin Dupret 4bf716c2ad Set highlighter to pygments when upgrading
In case you are upgrading from 1.4.2 to 2.0 and the pygments option is
set to true, then the highlighter option will be set to pygments
automatically.
2013-12-22 18:45:46 +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 92064134d6 Rename the pygments option to highlighter
Rename the pygments configuration option to highlighter to allow
different highlighters in the future. For now, the allowed values are
`pygments` and `null`.

It's now more straightforward to plug another syntax highlighter.
2013-12-22 12:45:15 +01:00
Aidan Feldman 2bfafb3b33 make non-data properties/methods accessible to Liquid
per https://github.com/jekyll/jekyll/pull/1849/files#r8490593
2013-12-22 03:38:32 -05:00
Aidan Feldman 45ee9f814a clarify page sorting test 2013-12-19 13:46:43 -05:00
Jens Nazarenus f9ffbe0d6a removed duplicate test scenario 2013-12-19 18:23:07 +01:00
Aidan Feldman a6e1c40051 link to Stack Overflow answer re: Dir sorting 2013-12-19 01:05:00 -05:00
Aidan Feldman 3c1d45f45f Sort pages by name by default
The order that files are returned differs across operating systems, so
ensure that they're being sorted after the fact.
2013-12-19 01:02:25 -05:00
Jens Nazarenus 43ef9a2e4f variables in include tag with filters 2013-12-17 23:51:52 +01:00
akira yamada a5545d5bad post_url tag raises ArgumentError for invalid name
Using post_url tag with invalid name raises TypeError.

It should raise ArgumentError and should display detail of the error to
fix the error.
2013-12-14 22:30:22 +09:00
Matt Rogers 39b6fe732f Merge pull request #1780 from mojombo/kill-1-8 2013-12-11 06:08:10 -08:00
Matt Rogers a7d4ee8bfb Merge pull request #1799 from konklone/maruku_fenced_code_blocks 2013-12-10 20:30:44 -08:00
Eric Mill 28ca5d71ee Remove comments 2013-12-09 16:47:42 -05:00
Eric Mill 470abf46e2 better, simpler test case... 2013-12-09 16:42:51 -05:00
Eric Mill 71e625e02c current state 2013-12-08 22:56:29 -05:00
Eric Mill 14418f74ae in-progress patch for maruku and fenced code blocks 2013-12-08 22:37:46 -05:00
Parker Moore 381ab4e71b Implement group_by Liquid filter & tests. 2013-12-08 01:16:48 -05:00
Parker Moore f14c9db282 Add tests in all the time that was omitted for Ruby 1.8.x 2013-12-08 00:48:25 -05:00
Parker Moore b4b6df5b6c Remove checks for Ruby 1.8.x 2013-12-08 00:48:10 -05:00
Matt Rogers 9f1593299a Merge pull request #1775 from Ivoz/maruku
Update to maruku 0.7
2013-12-06 20:56:52 -08:00
Matthew Iversen fb9de8cbf6 Fix tests to expect maruku 0.7 output 2013-12-05 12:20:11 +11:00
Parker Moore 3b0c8ad654 Add some unit tests for TOML integration. 2013-11-29 23:33:52 -05:00
Greg Karékinian 9182b1b7ae Fix duplicate test case name 2013-11-25 12:59:27 +01:00
Greg Karékinian 49d5c3457c Remove extra trailing whitespace 2013-11-20 00:50:56 +01:00
Matt Rogers 63713799cd Extract Site#filter_entries into its own class 2013-11-04 21:35:13 -06:00
liufengyun f971aebfb1 support jsonify filter 2013-10-22 23:52:22 +08:00
Matt Rogers 0e784596a5 Merge pull request #1543 from maul-esel/fix-coderay
Add tests for special handling of kramdown's coderay options
2013-10-17 06:35:43 -07:00
Matt Rogers 0761769dda Merge pull request #1615 from benbalter/downcase-lexers
Downcase lexers before passing to Pygments
2013-10-10 18:48:00 -07:00
Juan Ignacio Donoso 01f41a7cfc Add test to reflect #1622 behaviour 2013-10-08 14:17:56 -03:00
Ben Balter 9b0a7b3438 test for lexer case insensitivity 2013-10-06 16:06:20 -04:00
Matt Rogers 9d4f9169e9 Merge pull request #1514 from maul-esel/tag-errors
Consistent error handling in Liquid tags
2013-09-30 20:54:42 -07: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
maul.esel 1829c2734a 'gist' tag: switch to ArgumentError exception class
SyntaxError is reserved for Ruby's internal use.

Adjust the tests, including the call to liquid to
make it rethrow ArgumentErrors.
2013-09-19 23:23:04 +02:00
maul.esel 39c0d125bb fix tests for new behaviour 2013-09-19 14:24:22 +02:00
Shigeya Suzuki fbea3471dd Make TestConvertible to pass with utf-8 encoding 2013-09-19 12:21:25 +09:00
Matt Rogers 793eb96a77 Merge pull request #1490 from penibelst/allow-include-read-override
Extract include tag read file in a method
2013-09-18 19:34:45 -07:00
Anatol Broder f97eed544c Change exception type in tests 2013-09-17 22:20:41 +02:00
maul.esel b26327f20a simplify conditions for coverage reports 2013-09-14 15:28:41 +02:00
maul.esel ed58ba1508 add tests for moving of coderay settings for kramdown 2013-09-13 14:06:16 +02:00
maul.esel 76d56c2352 shorten test code by moving converter instantiation to #setup 2013-09-13 14:06:16 +02:00
maul.esel a12227c07a setup coveralls for unit tests 2013-09-12 21:19:36 +02:00
Parker Moore 097779a19f Merge pull request #1531 from maul-esel/mute-tests
mute LSI output in tests
2013-09-12 09:42:40 -07:00
maul.esel 87de8ddeb4 fix test muting to work for Ruby > 1.9 2013-09-12 13:26:32 +02:00
maul.esel 0afe79d1cb mute LSI output in tests 2013-09-11 18:00:28 +02:00
Ishibashi Hideto 421e58ad59 a patch for the issue: [Liquid doesn't render my partial · Issue #1519 · mojombo/jekyll](https://github.com/mojombo/jekyll/issues/1519) 2013-09-10 23:12:15 +09:00
Parker Moore 0d890e4b70 Merge pull request #944 from x3ro/permalink-special-characters
WIP - Improve permalink generation for URLs with special characters
2013-08-28 15:02:20 -07:00