Commit Graph

797 Commits

Author SHA1 Message Date
Jordon Bedwell f26cdd8da4 Create #mock_expects that goes directly to RSpec Mocks. 2015-04-14 14:20:55 -05:00
Parker Moore 00aa2955d8 generated site tests: put the static file mod time through a date filter 2015-04-14 11:52:26 -07:00
Parker Moore dead70724e Fix expectation for StaticFile#to_liquid in tests. 2015-04-14 11:52:26 -07:00
Alfred Xing 4f06ba7884 Remove Maruku-specific tests 2015-04-14 10:58:47 -07:00
Parker Moore bf98004843 Merge pull request #3608 from nickburlett/patch/incremental-build
Merge pull request 3608
2015-04-10 16:51:56 -04:00
Parker Moore f86727c45a DRY up the StaticFile tests a bit. #3633. 2015-04-10 16:24:45 -04:00
Martijn den Hoedt 28a1d2445e Added tests for Jekyll:StaticFile 2015-04-01 17:15:44 +02:00
Justin Weiss fa435fae94 Use `Jekyll::Post`s for both LSI indexing and lookup.
When looking for related posts, Jekyll was indexing `Jekyll::Post`
objects, but finding related posts based on `Jekyll::Post#content`. This
caused two problems:

1. Ruby 2.2 will warn on == if <=> throws an exception (and future Ruby
versions will surface that exception). Because `String`s can't be
compared with `Jekyll::Post`s, this warning was appearing all the time
while searching for related posts.

2. LSI won't return a post itself when searching for related posts. But
LSI could never tell that we were searching on a post, since Jekyll
passed post content, not a post object. With this fix, we can remove the
`- [post]` from `Jekyll::RelatedPosts#find_related`.

This is a more accurate fix for #3484.
2015-03-29 23:43:55 -07:00
Jordon Bedwell f75346c799 Merge pull request #3614 from nickburlett/patch/incremental-build-dest-missing
Incremental build if destination file missing
2015-03-28 19:26:01 -05:00
Nicholas Burlett 8f4194eea5 Clean up regeneration missing-destination checks
Use easier-to-follow checks for missing-destinations in the regenerator.
2015-03-24 21:21:37 -07:00
Parker Moore e7d0b6c5a5 Merge pull request #3545 from delftswa2014/site_extract_readers
Merge pull request 3545
2015-03-23 19:53:07 -07:00
Nicholas Burlett d39d0cea19 Create 'tmp' dir for test_tags if it doesn't exist
Rather than use script/test to create the tmp directory, create it in a setup block for the appropriate context in the `TestTags` test.
2015-03-22 22:52:16 -07:00
Nicholas Burlett d4b8f0d9dd Process metadata for all dependencies
When adding a dependency, also add the dependency to the metadata hash.

Addresses part 1 of #3591. Prior to this fix, the regnerator only paid attention the mtime of the first dependency it checked, so for posts/pages with N multiple dependencies (i.e., every layout file used to render them), it continues to regenerate the post/page approximately N times, at which point it's seen all of the dependencies.
2015-03-22 13:33:12 -07:00
Nicholas Burlett 706007ead9 Incrementally regenerate missing destination file
Addresses the third point of #3591, in which the incremental regenerator doesn't notice that destination files have gone missing.
2015-03-21 19:25:02 -07:00
Nicholas Burlett e770a080a7 Regenerator cache clearing tests
Two tests for the regenerator cache clearing changes:

1. Intrusively test that the regnerator.clear_cache actually clears the cache ( in test/test_regenerator.rb )
2. Test that incremental building regenerates files that have changed that previously were unchanged ( in test/test_site.rb )
2015-03-19 09:41:05 -07:00
Martin Rogalla 324748a5a6 Added corrections as suggested by @parkr.
- Replaced occurrences of #array += with concat
   operations.(performance)
 - Corrected alignment.
 - Removed rebase artifact.

Signed-off-by: Martin Rogalla <martin@martinrogalla.com>
2015-03-19 14:56:46 +01:00
Jordon Bedwell c6d62828ba Remove loader.rb and utilize "modernize" script/test. Fixes: #3573 2015-03-15 10:08:27 -05:00
Arthur Neves 67ba8ad0cb Use rspec-mock instead of rr 2015-03-06 20:13:07 -05:00
Martin Jorn Rogalla 00cdcbc184 Separated some more readers from the main reader.rb file.
- Draft Reader
 - Collection Reader
 - Page Reader
 - Post Reader
 - Static File Reader

Fixed references and ran tests.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-06 17:20:25 +01:00
Martin Jorn Rogalla bebd80342e Extracted draft, post reader into external classes.
Organized the draft, post and layout reader into the *readers* classes.
Fixed all references and ran tests.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-06 12:39:50 +01:00
Matt Rogers 02e98f238e Merge pull request #3520 from delftswa2014/sort-null 2015-03-05 14:35:40 -06:00
Martin Jorn Rogalla 4b8e3cfdbd Moved the in_(source/dest)_dir back to site.rb.
After carefully looking at these two methods, as of right now they do not
belong in the reader, as they should also be used by the writer. Thus the
decision was made to move them back into the class containing the source
and dest fields, site.rb.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-05 13:34:46 +01:00
ChaYoung You 7806f9ed52 Replace `File.exists?` with `File.exist?`
`File.exists?` is deprecated method. See
http://ruby-doc.org//core-2.2.0/File.html#exists-3F-method.
2015-03-05 18:21:52 +09:00
Martin Jorn Rogalla 2857350df1 Extracted `read_directories` from site.rb into reader.rb
- Extracted
  - Updated References
  - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com
2015-03-04 20:51:26 +01:00
Martin Jorn Rogalla a4adeb446b Extracted `read_posts` from site.rb into reader.rb
- Extracted
  - Updated References
  - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 20:22:37 +01:00
Martin Jorn Rogalla ddfecb0f53 Extracted `read_data_file` from site.rb into reader.rb
- Extracted
 - Updated References
 - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 19:55:54 +01:00
Martin Jorn Rogalla 05bbcddb29 Extracted `filter_entries` from site.rb into reader.rb
- Extracted
 - Updated References
 - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 19:46:10 +01:00
Martin Jorn Rogalla bb9d43dff5 Extracted `in_source_dir` from site.rb and into reader.rb.
Extracted `in_source_dir` from site.rb into reader.rb.
Updated all the references and tests.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 19:16:03 +01:00
Will Norris 0d1586a5c4 Improved permalinks for pages and collections
This updates the default permalink style for pages and collections to
match the site-wide 'permalink' setting.  If the permalink setting
contains a trailing slash, either explicitly or by being set to
':pretty', then pages and collections permalinks will contain trailing
slashes by default as well.  Similarly, if the permalink setting
contains a trailing ':output_ext', so will pages and collections.  If
the permalink setting contains neither a trailing slash or extension,
neither will pages or collections.

This impacts only the default permalink structure for pages and
collections.  Permalinks set in the frontmatter of an individual page
take precedence, as does the permalink setting for a specific
collection.

Fixes #2691
2015-03-04 09:38:23 -08:00
Will Norris 669c803912 always include file extension on destination files
This ensures that destination files for HTML posts, pages and
collections always include the proper file extension (as defined by
output_ext) regardless of permalink structure.  This allows for URLs
that contain no extension or trailing slash to still result in proper
destination files with .html extensions.

Because this change relies so heavily on output_ext accurately
identifying the extension of the destination file, this change also
removes the feature test that tested support for permalinks with a .htm
extension.  In order to support alternate file extensions, a future
patch or plugin will need to modify the output_ext value, at which point
everything else should work as expected.
2015-03-02 21:20:54 -08:00
Martin Jorn Rogalla 92a9582733 Corrected error message as suggested by @parkr.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-01 11:16:08 +01:00
Martin Jorn Rogalla 78af3c5018 Improved clarity of sort nil input error message.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-01 09:51:59 +01:00
Martin Jorn Rogalla 0565308ce6 Added test to check on nil input for sort filter.
- Added a test to check if the sort filter will raise the correct
   exception on given nil input.
 - Improved error message and used "nil" consistently.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-01 09:40:32 +01:00
Parker Moore 9b962dc565 Merge branch 'fabianrbz-remove_adapters_deprecation_warning'
* fabianrbz-remove_adapters_deprecation_warning:
  Add minitest/profile to profile 10 slowest tests
  Move simplecov_custom_profile to test/ & gate with TRAVIS env
  Remove unused groups from simplecov's profile
  Removes the following deprecation warning: 'method adapters is deprecated. use profiles instead'
2015-03-01 00:36:48 -08:00
Parker Moore f1edf9e692 Add minitest/profile to profile 10 slowest tests 2015-03-01 00:36:40 -08:00
Parker Moore fbe52bca85 Move simplecov_custom_profile to test/ & gate with TRAVIS env 2015-03-01 00:36:20 -08:00
Will Norris dae77e9a63 switch remaining textile test files to markdown
Textile support was removed from jekyll core in #3319, and most of the
tests switched to markdown at that time.  This changes the remaining
tests to use markdown as well.  The vast majority of the test cases were
testing things in the file name or front matter, so it doesn't really
matter what markup format they use.  The one test that was claiming to
test that textile was transformed had actually been moved to markdown as
well, just not renamed.

Fixes #3507
2015-02-27 18:29:52 -08:00
Fabian Rodriguez cd7b3f54f1 Removes the following deprecation warning:
'method adapters is deprecated. use profiles instead'

This warning was showing up because the project was using
the gem 'simplecov-gem-adapter' which uses the old syntax.

* Remove the gem dependency
* Add a profile with the same setup that the gem has
2015-02-27 23:01:48 -02:00
Alfred Xing 422fd7d304 Use `fixture_site` for Document tests
Should fix #3500
2015-02-24 20:31:16 -08:00
ChaYoung You 7db9397a9d
Remove trailing whitespace 2015-02-22 20:27:15 +09:00
Parker Moore 7ad0597bff Make our own Minitest::Test subclass for further subclassing 2015-02-21 00:33:47 -08:00
Parker Moore 52c4ce2a5a Finish of moving the unit tests over to Minitest 2015-02-21 00:31:07 -08:00
Parker Moore 4b59eb4175 Fix the test inheritance for the tests. 2015-02-20 13:35:02 -08:00
Parker Moore d2b19963c1 Move from Test::Unit to Minitest. 2015-02-20 13:34:51 -08:00
Parker Moore 1f503b24b3 highlight: duplicate tests for pygments for rouge
Ensure that the output we get for pygments will match
that we get for rouge in all cases except line numbers.
2015-02-09 21:57:43 -08:00
Parker Moore 32c48bb78d Highlight tag: add test for not removing interstitial newlines. 2015-02-01 23:03:10 -08:00
Parker Moore 65d43ef398 Move previous runtime dependencies to development dependencies. 2015-01-31 13:53:17 -08:00
Parker Moore aceb5b5d53 Merge branch 'jekyll-gjtorikian-patch-1'
* jekyll-gjtorikian-patch-1:
  Use the source_dir() helper
  Add test for new extracted method
  Factor out a `read_data_file` call to keep things clean
2015-01-31 00:12:33 -08:00
Parker Moore 32a2e8b4ef Use the source_dir() helper 2015-01-31 00:12:24 -08:00
Garen Torikian 3bac8a2034 Add test for new extracted method 2015-01-30 15:21:45 -08:00
Parker Moore 0c624eb11b The :title URL placeholder for collections should be the filename slug.
This mimicks posts most closely. It can be overridden by the
YAML front matter.

Undoes some of #2864.
2015-01-30 01:53:11 -08:00
Alfred Xing 31b03e9b86 Merge pull request #3325 from imathis/generate-url 2015-01-24 11:21:51 -08:00
Alfred Xing 58e231ce40 Rename Regenerator#write to Regenerator#write_metadata 2015-01-19 16:29:50 -08:00
Alfred Xing 29aabd84bd Fix up tests 2015-01-19 16:23:51 -08:00
Brandon Mathis 3d60299ea9 Test updates: Removed permalink config, updated template 2015-01-18 23:03:27 -06:00
Brandon Mathis 382049d558 Added a unit test for nil value in permalink template keys 2015-01-18 15:51:21 -06:00
Alfred Xing fe5f0d124c Move all regenerate? checking to Regenerator 2015-01-18 11:05:06 -08:00
Parker Moore 9d547f74cc Make all the tests happy. 2015-01-17 16:52:12 -08:00
Parker Moore c1da91cf5c Start removing mentions of Textile. 2015-01-17 16:51:28 -08:00
Parker Moore 10659e1eef Merge branch 'nitoyon-slugify-new-param'
* nitoyon-slugify-new-param:
  Remove superfluous Sass declarations.
  Move the slugify options out to their own section so as to fix the formatting.
  Document the mode parameter of slugify Liquid filter
  Add tests for mode parameters of slugify Liquid filter
  Add mode parameter to slugify Liquid filter

Conflicts:
	lib/jekyll/utils.rb

        ---> Hadn't added UTF-8 support in nitoyon's PR.
2015-01-17 16:06:10 -08:00
Parker Moore 3fe80929ad We have 47 posts now in the tests. 2015-01-17 15:28:03 -08:00
Parker Moore b2099ac763 Merge branch 'davidized-collection_yaml_dots'
* davidized-collection_yaml_dots:
  Move YAML Front Matter regexp into a constant.
  Add support for collections documents to have YAML front matter ending in dots.

Conflicts:
	test/test_collections.rb
2015-01-17 15:24:33 -08:00
Parker Moore a312115a5a Merge pull request #3014 from jekyll/revert-3013-revert-2921-post-dest 2015-01-17 15:13:17 -08:00
Parker Moore 84cfc1ceff Merge branch 'majioa-devel'
* majioa-devel:
  Ensure Post#excerpt_separator always returns a string.
  get procedure for default excerpt separator for both cases site and page was moved to the post's specific method :excerpt_separator.
  Added per post excerpt_separator functionality, so you are able to specify :excerpt_separator (as well as just :excerpt) key direct inside the post YAML, to make an excerpt based on the value in the post. Tests were also added.
2015-01-17 15:01:20 -08:00
Parker Moore ba2e1390ad Merge pull request #2571 from yous/patch-mixed-case-category 2015-01-17 14:55:30 -08:00
Matt Rogers ce78ea7818 Merge pull request #3220 from inukshuk/patch-1 2015-01-13 19:02:41 -06:00
Ryan Burnette 588bba39ad Add test for Date object in filters.rb 2015-01-13 13:51:36 -05:00
Sylvester Keil 60921132c6 Preserve original mtime when copying static files 2015-01-12 13:00:35 +01:00
Parker Moore 7c8e4d46eb Fix up new output for RDiscount 2. 2015-01-10 00:21:18 -08:00
Parker Moore 0bf82e9cf7 Merge pull request #3258 from omegahm/symlink-local-tmp 2015-01-10 00:12:06 -08:00
Parker Moore b9542c5426 Merge pull request #3279 from jekyll/fix-cross-platform-testing 2015-01-10 00:08:29 -08:00
Parker Moore 730aedd0a3 Add Rake's test loader because it is inconsistently installed. 2015-01-09 23:57:52 -08:00
Parker Moore 4cbd814546 Add support for Windows line feeds too. 2015-01-09 23:55:47 -08:00
Parker Moore cae9d96cc4 Add test for stripping just newlines from code blocks.
Ref #3275.
2015-01-09 23:51:34 -08:00
Malo Skrylevo 54d0bf47e8 Added per post excerpt_separator functionality, so you are able to
specify :excerpt_separator (as well as just :excerpt) key direct inside
the post YAML, to make an excerpt based on the value in the post. Tests
were also added.
2015-01-08 15:18:06 +03:00
Parker Moore 502fd94f2c Merge pull request #3172 from alfredxing/docs-output-overrides 2015-01-05 23:19:12 -08:00
Alfred Xing 7655b533c9 Allow documents to set `published` in front matter 2015-01-05 16:11:02 -08:00
Mads Ohm Larsen 1062fdf89f Use local tmp folder for symlink tests 2015-01-05 09:28:54 +01:00
Mads Ohm Larsen a2b6aa263e Add local tmp folder 2015-01-05 09:28:54 +01:00
Parker Moore a098dc80cd Merge pull request #3234 from jekyll/ruby-2-2 2014-12-29 20:49:04 -05:00
Parker Moore 7cd5847826 Merge pull request #3244 from jekyll/store-messages 2014-12-29 20:48:23 -05:00
Parker Moore 9109da32f9 Update test for the date() Liquid filter. 2014-12-29 20:44:10 -05:00
nitoyon 5e10958faa Unescape Document output path
Document#destination wasn't unescaped properly.

For example, when we have a document named '_langs/c#.md',
we expect its url to be '/langs/c#.html',
but it was actually '/langs/c%23.html'.

We now unecape URL at Document#destination like Post#destination and
Page#destination.
2014-12-29 22:38:50 +09:00
Parker Moore 1fc99bdd97 Test LogAdapter#messages 2014-12-29 01:21:01 -05:00
Parker Moore a6781bda30 Always, always rebuild (by default) in tests. 2014-12-29 00:37:16 -05:00
Parker Moore 612eb737a5 Merge pull request #3047 from karouf/slugify-non-latin 2014-12-29 00:31:34 -05:00
Parker Moore 004f923644 Revert "Revert "Make permalink parsing consistent with pages"" 2014-12-29 00:30:42 -05:00
Parker Moore e39dfa3f0b Merge pull request #2908 from alfredxing/document-path 2014-12-29 00:26:35 -05:00
Parker Moore 232a58d5b4 Fix test use of Site#getConverterImpl. 2014-12-28 14:14:24 -05:00
Parker Moore c24c6b7f3d Use 'enable_coderay' in the tests. 2014-12-26 22:17:33 -05:00
Parker Moore 5bf1596414 Refactor Highlight tag tests to use a helper method to create the tag. 2014-12-26 21:53:56 -05:00
Parker Moore 7227ad4ebb Merge pull request #3116 from alfredxing/incremental 2014-12-22 08:57:50 -05:00
Parker Moore 49115dbdab Merge pull request #3158 from afeld/as-liquid-refactor 2014-12-09 10:50:42 -08:00
Parker Moore 032139bd2f Ensure only one converter is found for .Rmd in the tests. Ref: #3147. 2014-12-07 16:08:16 -08:00
Matt Rogers f8af94431d Fix coverage reporting for built-in bundles 2014-12-02 20:50:39 -06:00
Alfred Xing a701e59c07 Add lots more unit tests 2014-11-27 10:40:31 -08:00
Aidan Feldman 229303bbc8 compare resulting data in jsonify test 2014-11-27 04:01:31 -06:00
Alfred Xing 02f281eef3 Add unit and cucumber tests 2014-11-26 21:15:53 -08:00
Aidan Feldman 0662d31bf6 fix jsonify filter when used with boolean values 2014-11-26 02:40:41 -06:00
Brandon Bradley d250efccb9 add test for broken markdown regexp 2014-11-24 19:56:26 -06:00