31178bfe69
Merge branch 'master' into liquid-4
2017-01-10 20:01:04 +01:00
368294b2a9
Update tests to be position independent
2017-01-06 05:55:50 -06:00
0f2013114c
Merge branch 'master' into jekyll-utils-exec
2017-01-06 05:42:15 -06:00
ea9c303c95
Merge branch 'master' of https://github.com/jekyll/jekyll into url-slash
2017-01-06 12:02:34 +05:30
4b51c1da58
Use `assert_nil`
2017-01-05 17:08:04 -06:00
dde0441b3a
find keys also in assigned collections
2016-12-16 15:37:10 -08:00
d24ea03acf
Update highlight block test to conform with v4 API.
2016-12-16 15:36:48 -08:00
69c4a8a1aa
Use `assert_nil` instead of `assert_equal nil`
...
Fixes #5648
2016-12-10 11:31:04 -06:00
8ed324007a
Merge pull request #5513 from thiagoarrais/5415-group_by_exp-filter
...
Merge pull request 5513
2016-12-09 16:01:21 -08:00
d4c8d7fd2b
Ignore symlinked file in windows
2016-12-09 13:15:16 -03:00
6e2449b482
Write Jekyll::Utils::Exec.run for running shell commands.
2016-12-07 17:38:22 -08:00
4ed41558d1
Whoops!
2016-11-30 17:54:59 -03:00
805dd4b0f1
Merge pull request #5611 from XhmikosR/https
...
Merge pull request 5611
2016-11-29 15:50:29 -08:00
d9cf97e9c6
Switch to `https` when possible.
...
Also, remove two 404 links.
2016-11-29 23:39:23 +02:00
4f4a628df8
fix tests
2016-11-29 13:37:10 +01:00
fac041933c
fix date parsing in file names
2016-11-29 09:14:03 +01:00
d175ba2cb8
clean unit-test-names
2016-11-28 23:09:53 +05:30
467bd5bb32
Updated test name, using single quotes for cleanliness.
2016-11-28 07:35:48 -05:00
875d55002b
Increased number of posts in test_generated_site to account for special chars test
2016-11-27 07:59:56 -05:00
a55760d4ad
Added unit test for special character, fixed error that it exposed.
2016-11-26 22:31:03 -05:00
5c965d6a20
Add connector param to array_to_sentence_string filter
2016-11-22 17:38:33 -06:00
cb6724046d
Dates are _the worst_
2016-11-11 16:30:53 -08:00
ff012e795a
Fix fmt error.
2016-11-11 16:30:53 -08:00
9f8f031469
Whoops, an *actually useful* failing test.
2016-11-11 16:30:53 -08:00
f27eb77d0b
Add failing test for permalink templates with trailing underscores
2016-11-11 16:30:53 -08:00
3e1fad273b
Merge pull request #5526 from ashmaroli/fix-win-tests
...
Merge pull request 5526
2016-11-10 13:02:48 -08:00
7bf4627046
Add vendor/gems to the list of excluded & do some refactoring.
2016-11-09 09:42:26 -08:00
1bafbd91fa
create orphan files with touch method
2016-11-05 16:03:30 +05:30
7f18ac8f99
Group using arbitraty Liquid expressions
2016-11-04 18:16:46 -03:00
2c68069a41
TestSite: consider dive-letter in Windows
...
The array of plugins will contain current drive-letter in Windows
2016-11-04 09:20:46 +05:30
1852e54d10
add and use 'skip_if_windows' helper method
...
- add a new helper method to skip tests if on Windows platform
- skip those tests that fail due to lack of support for symlinked files
on Windows.
2016-11-04 09:20:46 +05:30
9192e66b7b
assert instead of refuting
2016-11-04 01:17:54 +05:30
894d2a0415
test double slash when input = '/'
2016-11-04 00:50:54 +05:30
e92dd2055d
check for the urldrop key first
2016-11-02 21:30:23 +01:00
e6b9dd1cc1
TestFilters: adjust array size to ignore symlinks
...
Adjust the size of grouped-items array as it won't include symlinked
pages in Windows.
2016-11-02 22:55:12 +05:30
257e60b9a7
TestSite: add symlinked files only if not Windows
...
add symlinked files to "sorted_pages" array only when testing on
non-windows platforms.
2016-11-02 22:55:12 +05:30
0c234c90a9
TestGeneratedSite: add "|" to preserve newline
...
adding a pipe character ('|') preserves the formatting of
'expected_output' with a trailing newline bit, in windows.
2016-11-02 15:08:49 +05:30
a2ffde8f14
rewrite test to only not throw error
2016-11-02 00:22:20 +01:00
1bb2259a10
add failing test
2016-11-02 00:00:38 +01:00
6f05ebb520
Merge pull request #5433 from ayastreb/5429-data-dir-with-period-in-name
...
Merge pull request 5433
2016-10-06 10:22:23 -07:00
3de78877c0
Merge pull request #4873 from mlocher/bug-post-url
...
Merge pull request 4873
2016-10-05 11:40:04 -07:00
22a7714bba
Merge pull request #5212 from eloyesp/fix-excerpt-link-finder
...
Merge pull request 5212
2016-10-05 11:34:52 -07:00
275f5a6209
Merge pull request #5256 from kwokfu/patch-1
...
Merge pull request 5256
2016-10-05 11:34:06 -07:00
e27a65d9e3
Sanitize directory name as a key
2016-10-04 19:39:41 +01:00
01c33907a3
default site.url in dev environment to ` http://localhost:4000 `
...
take `host`, `port` and `ssl` options into account
2016-10-04 20:38:46 +02:00
cff8f2994c
Fix loading data from subdir with a period in name #5429
2016-10-01 13:09:50 +01:00
ef3f9d0e7a
Merge pull request #5264 from DirtyF/static-file-name
...
Merge pull request 5264
2016-09-29 14:13:31 -07:00
553fae8f17
Merge pull request #5410 from jekyll/pr/i18n-url-filters
...
Merge pull request 5410
2016-09-29 13:27:11 -07:00
fd5f2eb399
Add failing test for File.utime of a symlink in staticfile.
2016-09-28 16:54:58 -07:00
9c197d9555
Merge pull request #5210 from jekyll/node-must-die
...
Merge pull request 5210
2016-09-28 16:38:00 -07:00
2b30c06140
Use Addressable to better deal with i18n URLs
2016-09-24 15:34:00 -05:00
aebf711c61
Failing tests: URL filters choke on i18n
2016-09-24 15:11:04 -05:00
bacb300876
Skip Windows tests in non-Windows environment.
2016-09-24 21:55:02 +08:00
db53213d16
Merge remote-tracking branch 'jekyll/master' into patch-1
2016-09-24 08:46:24 +08:00
aa86651650
Add absolute_url and relative_url filters.
2016-09-22 14:16:00 -07:00
3a7cbadd82
Merge pull request #5375 from Nicop06/underscore_highlight
...
Merge pull request 5375
2016-09-20 17:05:49 -07:00
504411e476
Merge pull request #5237 from ashmaroli/bundle2new
...
Merge pull request 5237
2016-09-20 15:32:25 -07:00
279f1516d2
Merge branch 'master' into themes-asset-folder
...
* master:
Update history to reflect merge of #5381 [ci skip]
Update history to reflect merge of #5383 [ci skip]
run features on windows
Appease Rubocop
Update history to reflect merge of #5372 [ci skip]
Add missing period to sentence in first paragraph.
2016-09-20 13:13:01 -07:00
29d8fee4ce
Add test to ensure that the /assets theme reader doesn't clobber preexisting site files.
2016-09-20 13:12:34 -07:00
3bfdc00d14
Appease Rubocop
2016-09-19 13:15:02 -05:00
0b94cf3fa1
Allow underscore in highlighter language
2016-09-19 13:10:29 +02:00
74baeb889a
ThemeAssetsReader: fix tests so everything passes.
2016-09-18 15:04:15 -04:00
6d7f305e7c
Add tests for assets directory support.
2016-09-16 16:04:35 -07:00
cf26bf5db0
TestTheme: update tests for 'path_for' now that it's no longer prepending the underscore
2016-09-16 15:36:33 -07:00
b8f17b9034
Exclude node_modules by default
...
If no 'exclude' directive is specified, exclude node_modules by default.
https://twitter.com/mxstbr/status/761856359579185153
2016-09-16 13:09:10 -07:00
4888b84b44
Merge pull request #5199 from jeffkole/adds-linking-to-all-files
...
Merge pull request 5199
2016-09-13 07:11:50 -07:00
345f043cc4
test bundle install and skipping it.
2016-09-13 08:52:54 +05:30
c1e6f1fb94
Fix rubocop errors & add one more test for slugify 'ascii' mode ( #4680 )
2016-09-07 17:50:14 -07:00
9164973a6c
Merge branch 'jussikinnula-master'
...
* jussikinnula-master:
Fix slugify test
One final "urlsafe" replaced with "ascii"
Change urlsafe to ascii also when actually slugifying
Add tests for ascii slugify mode
Rename urlsafe to ascii, and document it (on utils.rb)
Add urlsafe to accepted slugify modes
Add urlsafe method for slugify
2016-09-07 16:50:32 -07:00
9b09d8a8e8
Add support for indented link references on excerpt
...
Excerpt link reference extraction is missing all the indented references
at the bottom of the page. Markdown specify that those can be indented up
to three spaces.
2016-09-02 17:21:10 -03:00
6a34966f20
Merge pull request #5189 from jekyll/skip-theme-if-not-string
...
Merge pull request 5189
2016-08-30 14:54:47 -07:00
5b21f8fda9
Fix fmt errors.
2016-08-30 13:28:46 -07:00
2b15b0b325
Site#configure_theme: don't do anything if theme config is unset; TEST
2016-08-30 12:17:24 -07:00
a9da814f17
add basename and name variables for static files
2016-08-27 11:22:24 +02:00
23d7929948
Test case for issue #5192 , where Jekyll.sanitized_path strips drive name on Windows incorrectly
2016-08-26 11:43:32 +08:00
0d8796fbe6
Test case for issue #5276 , where Jekyll.sanitized_path strips base path incorrectly if file path has matching prefix
2016-08-26 11:20:03 +08:00
326332a5d5
Rename filename to name
2016-08-21 21:32:26 +02:00
87c00b2756
Get static filename
2016-08-20 17:42:05 +02:00
a9f92278d3
colorize interpolated text in Jekyll.logger.info
2016-08-16 22:50:54 +05:30
70ba8c578a
update require_gems test
2016-08-07 21:01:09 +02:00
539154a158
replace `assert false, ...` with `refute`
2016-08-07 20:54:22 +02:00
e0ce4a00f8
Fixes `link` tag to work with static files
2016-08-04 20:03:01 -07:00
05445b81c7
Fixes tests to account for new info.md file
2016-08-04 19:40:14 -07:00
82d6657ae8
Adds ability to link to all files
...
Fixes request made in #4624 and bug found in #5182
2016-08-03 15:08:26 -07:00
d158d73ce1
add missing tests
2016-07-30 15:49:16 +02:00
2236ee4284
migrate existing tests to `should` syntax
2016-07-30 15:48:21 +02:00
0f3ce73516
Merge pull request #4860 from pathawks/pr/where_exp
...
Merge pull request 4860
2016-07-25 12:16:55 -07:00
9176924eab
filters: raise error if no input given to date filters
2016-07-24 01:37:35 +03:00
dbc0349909
tests: Typo fixes.
2016-07-18 21:20:47 +03:00
eb88aa330c
Merge pull request #5060 from stomar/stringify-overrides
...
Merge pull request 5060
2016-07-15 17:26:14 -07:00
3ae7d0c319
Merge pull request #5101 from crispgm/dev_to_integer_filter
...
Merge pull request 5101
2016-07-15 09:58:08 -07:00
20b3758edb
Add to_integer filter
...
Add to_integer filter
Fix test_filter: parenthesize the method
Fix offense: seperate every 3 digits with _
rubocop:disable Metrics/ModuleLength
More descriptive exception
Fix fmt error
Remove if stmt for integer input
Remove rescue for to_i
Remove error message assert
2016-07-15 08:38:36 +08:00
99663a9199
object needs to respond to select instead of being an enumerable
2016-07-14 13:11:09 -05:00
2b57795c7f
Failing test: where_exp filter should filter posts
2016-07-14 13:08:25 -05:00
73223f3a5a
Fix Rubocop warnings
2016-07-14 12:15:00 +02:00
49e97ef9b0
Add test case for deprecated post comparison
...
Checks that `post_url` works for nested posts even if the path isn't specified. Also checks that a deprecation message is shown in the build log.
2016-07-14 11:53:58 +02:00
1f366730f8
Merge pull request #5069 from Crunch09/issue-2834
...
Merge pull request 5069
2016-07-12 19:50:32 -07:00
146d0f301d
Merge pull request #5067 from jekyll/excerpt-drop-previous-doc
...
Merge pull request 5067
2016-07-11 11:20:22 -07:00
cc82d44222
check if relative URL contains a colon
...
fixes #2834
2016-07-08 20:33:47 +02:00
ba8573c420
Change baseurl to example.com for some test cases
2016-07-08 15:48:14 +02:00
1c0f21230d
Stringify configuration overrides before first use
...
This makes sure that overrides for Jekyll.configuration
all have string keys before their first use, particularly
also the "config" and "skip_config_files" options.
2016-07-08 15:47:26 +02:00
c46f219d3c
Commit failing test for lack of certain excerpt drop properties.
2016-07-07 13:34:10 -07:00
d4c87e3655
Remove useless statement from test
2016-07-07 15:30:59 +02:00
3aead1d4a9
Imitate fetch method instead of creating real Hash object
2016-07-06 11:20:37 +03:00
72d49490d2
Add fetch method to Drops
2016-07-05 21:22:24 +03:00
b772329c60
Merge branch 'master' into remove-jruby-and-ruby-head
...
* master: (41 commits)
Fix rubocop offenses on master.
script/fmt: print Rubocop version
Update history to reflect merge of #5030 [ci skip]
rubocop: separate deprecator error messages
Update history to reflect merge of #5031 [ci skip]
Update history to reflect merge of #5032 [ci skip]
rubocop: fix code style
rubocop: fix code style
rubocop: fix code style
Update history to reflect merge of #5024 [ci skip]
Update history to reflect merge of #5025 [ci skip]
utils: check that the object is a hash when merging default_proc
Update history to reflect merge of #5026 [ci skip]
rubocop: refactor modified? method
Add a benchmark for capture vs. assign in Liquid. [ci skip]
Update history to reflect merge of #5027 [ci skip]
Add generator-jekyllized to third party plugins
rubocop: fix code style
rubocop: fix code style
rubocop: fix code style
...
2016-06-29 00:52:58 -07:00
a7d25ed963
Fix rubocop offenses on master.
2016-06-28 22:08:06 -07:00
6f3c01ca87
Fix for jruby
2016-06-28 18:30:02 -07:00
2ef70fd348
Some weird stuff with Colorator on my machine & jruby.
2016-06-28 14:39:06 -07:00
12c1ada0e5
test: skip openssl test for jruby
2016-06-28 12:43:15 -07:00
fb1a459ddd
Merge pull request #4917 from pathawks/pr/normalize_whitespace
...
Merge pull request 4917
2016-06-14 14:03:05 -07:00
f5a0db9dcc
Rubocop: use %r for all regular expressions.
2016-06-02 17:08:21 -07:00
6a07254cbf
Merge pull request #4953 from Crunch09/issue-4850
...
Merge pull request 4953
2016-06-02 16:59:51 -07:00
5dfaa66d48
Failing test: markdownify a number
2016-05-28 15:18:37 -05:00
f8c038566c
`Serve.process` should receive same config as `Build.process`
...
fixes #4850
2016-05-27 11:46:04 +02:00
fbff506faa
Rubocop: test/test_site.rb
2016-05-26 00:00:08 -05:00
5a23b130ce
Rubocop: test/test_utils.rb
2016-05-25 22:01:10 -05:00
8fbeb52314
Rubocop: test/test_tags.rb
2016-05-25 22:00:58 -05:00
98262b73d5
Rubocop: test/test_regenerator.rb
2016-05-25 22:00:29 -05:00
474fc0a9a8
Rubocop: test/test_page.rb
2016-05-25 22:00:15 -05:00
7537b01e74
Rubocop: test/test_liquid_renderer.rb
2016-05-25 22:00:05 -05:00
23646549c4
Rubocop: test/test_kramdown.rb
2016-05-25 21:59:54 -05:00
c00c761e1d
Rubocop: test/test_entry_filter.rb
2016-05-25 21:59:43 -05:00
5291bd0498
Rubocop: test/test_document.rb
2016-05-25 21:59:33 -05:00
fd75f0f7b1
Rubocop: test/test_configuration.rb
2016-05-25 21:59:23 -05:00
6ef2bcb29a
Rubocop: test/test_filters.rb
2016-05-25 21:59:11 -05:00
34d172007b
Merge branch 'pathawks-rubocop/misc'
...
* pathawks-rubocop/misc:
Fix Page#relative_path so that it consistently does NOT have the prepending slash (previously inconsistent)
Rubocop cleanup for lib/jekyll/layout.rb
Rubocop cleanup for lib/jekyll/plugin_manager.rb
Rubocop cleanup for lib/jekyll/page.rb
2016-05-25 17:57:52 -07:00
4fbbeddae2
Fix Page#relative_path so that it consistently does NOT have the prepending slash (previously inconsistent)
...
Fixes for #4946
2016-05-25 17:57:09 -07:00
aff1430608
Fix tests for document drop JSONification based on master updates. /cc #4914
2016-05-25 16:04:16 -07:00
e56e58e498
Merge branch 'master' into pathawks-fp/jsonify-drops
...
* master: (38 commits)
Mention where it came from. [ci skip]
Update history to reflect merge of #4944 [ci skip]
Update history to reflect merge of #4943 [ci skip]
Mention where it came from. [ci skip]
Update history to reflect merge of #4942 [ci skip]
Update history to reflect merge of #4941
External: remove &block arg, use block_given?
Update history to reflect merge of #4936 [ci skip]
lib/jekyll.rb: require document_drop to ease our pain
Sort the results of the require_all glob.
Rubocop fixes
Reset {{ layout }} between each render & merge layout data properly
Add failing test for layout data inheritance bug (#4433 )
Add failing test for layout bug (#4897 )
Fix tests for plugins in configuration.
Define Drop#each so we can use the new frozen/duping behavior
Don't default 'include' and 'exclude' to an empty array
Fix some minor things in the tests
Freeze configuration defaults & duplicate in deep_merge_hashes if need be.
Remove merge conflicts I forgot to fix.
...
2016-05-25 15:55:47 -07:00
cf810a88fa
Merge pull request #4942 from pathawks/fp/configuration-from-permalink-fix
...
Merge pull request 4942
2016-05-25 15:42:05 -07:00
f8c708ffec
Fix test to simply ensure next is an object in jsonify
2016-05-24 19:08:50 -05:00
17d8c96a63
Add ability to render drops as JSON
...
Previously you could do, e.g. {{ site | jsonify }}, but with the introduction of Liquid Drops, this didn't work anymore.
This PR adds the ability to render drops as JSON. You can safely run drop.to_json and it should Do the Right Thing.
2016-05-24 19:08:46 -05:00
cc0c5ea19e
Rubocop fixes
2016-05-24 19:01:35 -05:00
7641971d7e
Fix tests for plugins in configuration.
2016-05-24 18:49:06 -05:00
de5970ae55
Fix some minor things in the tests
2016-05-24 18:49:05 -05:00
ad59b6e62a
Remove merge conflicts I forgot to fix.
2016-05-24 18:49:02 -05:00
37b93f10dd
Add missing 'end' to test/helper.rb
2016-05-24 18:47:15 -05:00
59346eb228
Remove call to #backwards_compatibilize in Configuration.from
2016-05-24 18:47:15 -05:00
4e06f07ad4
Add tests for Configuration#add_default_collections
2016-05-24 18:47:14 -05:00
dbcbf809ff
Refactor some tests to prevent manipulation of Jekyll::Config::DEFAULTS
2016-05-24 18:47:04 -05:00
c69ca4c11e
Test#build_configs shouldn't overwrite default collections
2016-05-24 18:40:19 -05:00
48f16974ce
Rubocop fixes
2016-05-24 18:27:37 -05:00
7d3f8ac75d
excerpt drop should give access to document's layout
2016-05-24 17:35:03 -05:00
3896f6d5d8
Use require_relative
2016-05-24 17:32:33 -05:00
b019234007
Add ExcerptDrop and remove excerpt's ability to refer to itself in Liquid
2016-05-24 17:30:03 -05:00
6db5272528
Splitting args onto own lines in test/test_static_file.rb
...
For functions where the character limit was exceeded
and line wrapping was needed, this commit just splits
each arg into it's own line.
2016-05-20 21:24:34 -05:00
8f07affe2a
Rubocop fixes for test/test_related_posts.rb
2016-05-20 21:23:29 -05:00
a9f110b861
Rubocop fixes for test/test_sass.rb
2016-05-20 21:23:29 -05:00
16c1146b4f
Rubocop fixes for test/test_static_file.rb
2016-05-20 21:23:29 -05:00
1380836a4b
Rubocop fixes for test/test_theme.rb
2016-05-20 21:23:29 -05:00
013e2f159d
Rubocop fixes for test/test_url.rb
2016-05-20 21:23:29 -05:00
f7714add15
Add normalize_whitepace filter
2016-05-19 19:59:22 -07:00
ce9a8cb0f2
Moving url to local var for better readability
2016-05-16 20:42:59 -05:00
df585aa5c6
Moving expected output into variable to make asserts more readable
2016-05-16 20:13:50 -05:00
b006810f17
Moving .with down one line 4x times
2016-05-16 19:59:13 -05:00
98eef8af95
Aligning hashes per 2caff75
2016-05-16 19:48:04 -05:00
211c16003e
test/test_exerpt.rb variable assignment cleanup
2016-05-16 19:39:43 -05:00
bc16d13d79
Shortening messages to keep things down to one line where possible
2016-05-16 19:31:43 -05:00
6ef54393c2
Rubocop fixes for test/test_redcarpet.rb
2016-05-16 19:26:53 -05:00
de5d773a6a
Rubocop fixes for test/test_rdiscount.rb
2016-05-16 19:26:53 -05:00
df7992c626
Rubocop fixes for test/test_plugin_manager.rb
2016-05-16 19:26:53 -05:00
df01b6825e
Rubocop fixes for test/test_path_sanitization.rb
2016-05-16 19:26:53 -05:00
c76b458dd5
Rubocop fixes for test/test_new_command.rb
2016-05-16 19:26:53 -05:00
ad98883843
Rubocop fixes for test/test_log_adapter.rb
2016-05-16 19:26:53 -05:00
5a1a8c9c82
Rubocop fixes for test/test_liquid_extensions.rb
2016-05-16 19:26:53 -05:00
271a8aebfb
Rubocop fixes for test/test_layout_reader.rb
2016-05-16 19:26:53 -05:00
0635bbba06
Rubocop fixes for test/test_generated_site.rb
2016-05-16 19:26:53 -05:00
555b2fbe72
Rubocop fixes for test/test_front_matter_defaults.rb
2016-05-16 19:26:53 -05:00
c8cae38da6
Rubocop fixes for test/test_excerpt.rb
2016-05-16 19:26:53 -05:00
cfe6cf7ca1
Rubocop fixes for test/test_doctor_command.rb
2016-05-16 19:26:53 -05:00
454a1e415c
Rubocop fixes for test/test_convertible.rb
2016-05-16 19:26:53 -05:00
5034cc377a
Rubocop fixes for test/simplecov_custom_profile.rb
2016-05-16 19:26:53 -05:00
aad587ca2f
Rubocop fixes for test/helper.rb
2016-05-16 19:26:53 -05:00
146d49dc8f
Rubocop test cleanups for #4885
...
This commit cleans up rubocop violations for the following files:
test/test_ansi.rb
test/test_cleaner.rb
test/test_coffeescript.rb
test/test_collections.rb
test/test_command.rb
test/test_commands_serve.rb
2016-05-16 19:26:53 -05:00
3751b47c50
Cleanup EntryFilter and make it far more robust.
...
* Allow users to filter directories by ending their path with "/"
* Allow users to filter with a Regexp, some scenariors can really require it.
* Use Pathutil#in_path? for Symlink verification, it real/expand.
This also requires some downstream work in "jekyll-watch" which at this time is
not very robust, it doesn't recognize the difference either, and should probably
start doing so (what I mean is detecting "/" and using the full path.)
2016-05-10 20:01:02 -05:00
1d788203df
Merge pull request #4710 from fenollp/safe-symlinks
...
Merge pull request 4710
2016-04-21 17:38:00 -07:00
298d56aab2
Merge pull request #4808 from jekyll/fix-collection-defaults-
...
Merge pull request 4808
2016-04-21 17:20:02 -07:00
57ccbe08ea
Ensure symlinks work as expected (and secured).
2016-04-21 16:32:52 -07:00
d5dd423bfd
Add cucumber specs.
2016-04-21 16:09:23 -07:00
42cc2445a5
Merge branch 'master' into themes
...
* master: (58 commits)
Update history to reflect merge of #4792 [ci skip]
Update history to reflect merge of #4793 [ci skip]
Update history to reflect merge of #4804 [ci skip]
Update history to reflect merge of #4754 [ci skip]
Update history to reflect merge of #4813 [ci skip]
Added missing single quote on rsync client side command
Add v3.0.4 and v3.1.3 to the history.
Fixed typo
Add jekyll-autoprefixer plugin
Explicitly require Filters rather than implicitly.
Update history to reflect merge of #4786 [ci skip]
Update history to reflect merge of #4789 [ci skip]
updates example domain in config template
Globalize Jekyll's Filters.
Update JRuby to 9.0.5.0; Drop the double digit test.
Update Rack-Jekyll Heroku deployment blog post url
convertible: use Document::YAML_FRONT_MATTER_REGEXP to parse transformable files
Update history to reflect merge of #4734 [ci skip]
Update history to reflect merge of #4478 [ci skip]
Fix rubocop warning.
...
2016-04-21 11:43:35 -07:00
655ffd45be
Use source_dir instead of my own computer's path
2016-04-21 11:26:33 -07:00
40e3a04704
test_document: scopes are based on relative_path
2016-04-18 13:56:02 -07:00
66c4ff8800
Add a where_exp filter for filtering by expression
...
This commit introduces a where_exp filter, which can be used as follows:
`{{ array | where_exp: "item", "item == 10" }}`
`{{ array | where_exp: "item", "item.field > 10" }}`
`{{ site.posts | where_exp: "post", "post contains 'field'" }}`
`{{ site.posts | where_exp: "post", "post.array contains 'giraffes'" }}`
This permits a variety of use cases, such as reported in: jekyll#4467,
jekyll#4385, jekyll#2787.
2016-04-12 18:52:58 +01:00
1efb1d7a58
Fix #4689 : Use SSLEnable instead of EnableSSL and make URL HTTPS.
2016-04-12 02:59:48 -05:00
6ee728efcb
Merge pull request #4537 from Crunch09/fix-warnings
...
Merge pull request 4537
2016-03-31 18:37:32 -07:00
4effe25cc1
Fix slugify test
2016-03-29 10:11:47 +03:00
487631e935
Add tests for ascii slugify mode
2016-03-29 09:07:30 +03:00
f80321ecac
Update Rake.
...
Update Rake and disable verbosity when running the specs because we have some
deprecated usage (for now -- however, see: jekyll/jekyll#4719 ) and because
Rouge, and Liquid throw out thousands (probably hyperbolic) of warnigns when the
specs are being ran. We need upstream to fix their problems while we fix ours
or we'll all have a bad day, not that we aren't already.
2016-03-27 22:22:35 -05:00
9347e90a67
Use EntryFilter throughout & update tests
2016-03-26 16:40:19 +01:00
4aadfe9fd7
Add test that filters out symlink pointing outside site source
2016-03-26 14:16:43 +01:00
33255e3ac3
IncludeTag: implement multiple load paths
2016-03-25 17:44:29 -07:00
a30068bf3f
Merge remote-tracking branch 'origin/master' into themes
...
* origin/master: (65 commits)
Update history to reflect merge of #4703 [ci skip]
Update history to reflect merge of #4712 [ci skip]
Highlight the test code
Update history to reflect merge of #4640 [ci skip]
readded "env=prod"-condition
Update history to reflect merge of #3849 [ci skip]
Update history to reflect merge of #4624 [ci skip]
Update history to reflect merge of #4704 [ci skip]
Update history to reflect merge of #4706 [ci skip]
Checks for link file extension in tests
Updating assets documentation
Fix test teardown for cleaner.
Update history to reflect merge of #4542 [ci skip]
Add explanation of site variables in the example _config.yml
Use double quotes in the gemfile
Add test for creation of Gemfile by 'jekyll new'
Add comment about github-pages
Update history to reflect merge of #4533 [ci skip]
Ensure Rouge closes its div/figure properly after highlighting ends.
Add Site#config= which can be used to set the config
...
2016-03-25 16:30:25 -07:00
6aae64c985
Update test_theme.rb
2016-03-25 15:22:29 -07:00
d213981a24
Fix warnings
...
This removes the following warnings:
- /lib/jekyll/configuration.rb:151: warning: instance variable @default_config_file not initialized
- /lib/jekyll/converter.rb:12: warning: instance variable @highlighter_prefix not initialized
- /lib/jekyll/converter.rb:24: warning: instance variable @highlighter_suffix not initialized
- /lib/jekyll/converters/markdown.rb:9: warning: instance variable @setup not initialized
- /lib/jekyll/converters/markdown/kramdown_parser.rb:60: warning: instance variable @highlighter not initialized
- /lib/jekyll/frontmatter_defaults.rb:97: warning: shadowing outer local variable - path
- /lib/jekyll/plugin.rb:66: warning: instance variable @safe not initialized
- /lib/jekyll/regenerator.rb:147: warning: instance variable @disabled not initialized
- /test/test_convertible.rb:40: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_filters.rb:154: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_new_command.rb:84: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_site.rb:234: warning: assigned but unused variable - site
- /test/test_site.rb:240: warning: assigned but unused variable - site
- /test/test_site.rb:522: warning: assigned but unused variable - source
- /test/test_tags.rb:153: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_tags.rb:425: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_tags.rb:449: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_tags.rb:496: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_tags.rb:496: warning: instance variable @result not initialized
- /test/test_tags.rb:511: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_tags.rb:773: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_tags.rb:773: warning: instance variable @result not initialized
- /test/test_tags.rb:788: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_url.rb:66: warning: shadowing outer local variable - doc
- /lib/jekyll/url.rb:119:in `escape_path': warning: URI.escape is obsolete
2016-03-25 22:03:17 +01:00
0f90fe67d2
but who will test the testers?
2016-03-25 15:00:42 -04:00
4a70382d5b
test that themes register with sass
2016-03-25 14:48:44 -04:00
f60d3a8dbc
Allow symlinks iff they point to stuff inside site.source
2016-03-25 15:14:04 +01:00
7a4817e55a
Merge pull request #3849 from shinkondo/master
...
Merge pull request 3849
2016-03-24 13:54:03 -07:00
da4a664290
Merge pull request #4624 from jeffkole/feature/add-collection-url-tag
...
Merge pull request 4624
2016-03-24 12:50:05 -07:00
54fcc97725
Checks for link file extension in tests
2016-03-24 08:54:31 -07:00
c27c669796
Fix test teardown for cleaner.
2016-03-23 20:37:13 -05:00
87d0f03f5c
Merge pull request #4542 from jekyll/jekyll-new-with-gemfile
...
Merge pull request 4542
2016-03-23 17:49:46 -07:00
01d48320fd
Merge remote-tracking branch 'upstream/master'
2016-03-23 19:33:22 -05:00
da35e134f1
Add test for creation of Gemfile by 'jekyll new'
2016-03-23 17:24:38 -07:00
4ce50e3936
Merge pull request #4533 from hgoodman/feature/show-dir-listing
...
Merge pull request 4533
2016-03-23 17:01:16 -07:00
007b7d45dc
Ensure Rouge closes its div/figure properly after highlighting ends.
...
Fixes #4474
2016-03-23 14:04:11 -07:00
aeecbd741f
Add test to inspect strings
2016-03-21 15:45:29 -07:00
848b1358a1
Merge pull request #4491 from jekyll/ignore-tilde
...
Merge pull request 4491
2016-03-20 15:34:35 -07:00
4b32bd2b13
Updates code styling per PR
2016-03-17 14:26:13 -07:00
f79f9d60a9
Changes `collection_url` tag to `link` tag
2016-03-17 14:01:04 -07:00
97efa0f0ce
Clean up Tags::PostUrl a bit
2016-03-15 16:06:25 -07:00
64e4984ff5
theme: fix invalid theme test, really
2016-03-11 20:59:54 +00:00
7b63c8d201
theme: fix invalid theme test
2016-03-11 20:45:22 +00:00
0a04932020
remove assets dir from theme fixture
2016-03-11 14:46:05 -05:00
e3c71ea407
Merge branch 'master' into themes
2016-03-11 14:44:44 -05:00
92168954d2
remove asset support
2016-03-11 14:41:26 -05:00
9e0ed00a59
Merge pull request #4555 from timwis/patch-1
...
Merge pull request 4555
2016-03-08 16:25:15 -08:00
c86fba6fb3
use /assets for theme assets, not _assets
2016-03-06 15:42:08 -05:00
8b880cb993
add theme tests
2016-03-05 13:35:52 -05:00
e130a0841f
add test to ensure where doesn't match substrings
2016-03-03 15:56:54 -05:00
b80a0cb5ce
Adds collection_tag
...
This tag mirrors the post_tag functionality but for collections instead of just
posts.
2016-03-02 14:56:30 -08:00
de8f67c4a2
Fix link issues in the site found by HTML Proofer.
2016-03-01 19:43:22 -08:00
f274179d9b
Merge pull request #4618 from spudowiar/fix-test-state-leakage
...
Merge pull request 4618
2016-03-01 11:59:07 -08:00
b0c730d278
kramdown: fix state leakage ( #4617 ) in test
...
fixes #4250
2016-03-01 18:41:04 +00:00
c16a2f4d6a
Merge pull request #4590 from tonyg/pr4582
...
Merge pull request 4590
2016-02-29 16:12:06 -08:00
cddea273a9
Merge pull request #4557 from timwis/patch-2
...
Merge pull request 4557
2016-02-29 16:08:11 -08:00
ac704b9763
Merge pull request #4545 from jekyll/allow-no-extensions-coll-docs
...
Merge pull request 4545
2016-02-29 15:50:29 -08:00
fa1eb68941
Fix for issue #4582 , plus simple test
2016-02-26 11:06:03 -05:00
3fbca47b1a
add test for group_by size property
2016-02-25 10:41:23 -05:00
f5f8548eb8
add tests for where arrays
2016-02-25 10:24:47 -05:00
d929242e2b
Permalinks which end in a slash should always output HTML
...
Duplicates #4493 for 3.1.1.
/cc @jekyll/core
2016-02-19 15:02:13 -08:00
3aa80b7d04
Allow collections to have documents that have no file extension
2016-02-19 13:40:17 -08:00
d387fd0baa
Add show_dir_listing option for serve command
2016-02-17 20:54:57 -08:00
db9865ebb6
Merge pull request #4525 from atomicules/capitalize-in-titleize
...
Merge pull request 4525
2016-02-15 20:50:42 -08:00
e4aa45b03f
Fix titleize_slug so already capitalized words are not dropped
...
Previously `titleize` used `capitalize!` which has the side effect of
returning `nil` for anything already starting with a capital letter. This
commit changes it to just `capitalize`.
Example, before:
A file "2016-01-01-This-is-a-title-with-Capitals.markdown" would return "Is A
Title With" for `post.title`
Example, after:
A file "2016-01-01-This-is-a-title-with-Capitals.markdown" will return "This Is A
Title With Capitals" for `post.title`
Tests added for `titleize_slug` in test_utils.rb
Fix problem introduced in 67f842546e#4525
2016-02-15 21:22:50 +00:00
a040af37c0
Jekyll.sanitized_path: sanitizing a questionable path should handle tildes
2016-02-07 17:53:26 -08:00
0e89a37eaf
Revert "Jekyll.sanitized_path: sanitizing a questionable path should handle tildes"
...
This reverts commit 246e65914f
2016-02-07 17:53:09 -08:00
246e65914f
Jekyll.sanitized_path: sanitizing a questionable path should handle tildes
2016-02-07 17:52:15 -08:00
3373eb6525
EntryFilter#special?: ignore filenames which begin with '~'
2016-02-07 17:28:03 -08:00
00d753612c
Merge pull request #4404 from jekyll/bom-it
...
Merge pull request 4404
2016-01-28 17:20:33 -08:00
5fc48ffcb9
Suppress stdout in liquid profiling test
...
The test was spewing out some whitespace
2016-01-27 14:06:48 -08:00
b1868983c7
Add test for Page#dir in :date/nil modes
2016-01-27 08:44:59 -08:00
aad54c9a87
Add Utils.merged_file_read_opts to unify reading & strip the BOM
2016-01-26 17:08:54 -08:00
d7ff4234f0
Renderer#output_ext: honor folders when looking for ext
...
Previously, even if the document permalink was a folder, it would look for
an extension on that. For example, if I have:
permalink: "/new-version-jekyll-v3.0.0/"
the output_ext would be ".0". Now, the output_ext honors the trailing
slash and will report based on the converters instead.
2016-01-25 15:32:44 -08:00
1298ba6908
Fix #4188 : Extract title from filename successfully when dateless.
2016-01-22 09:09:30 -08:00
4ecdf6ce10
Remove extra OR condition since a missing hash key will return a nil anyway. Added a test to catch this nil condition since it was missing to begin with. Reduced line length in test_page.rb
2016-01-21 23:44:30 -06:00
a351a70b03
test: Slight refactor to doublecheck destination.
2016-01-18 14:08:53 -08:00
275d56a0fe
test: use {assert,refute}_exist everywhere
2016-01-18 13:45:36 -08:00
2de5bacb41
pages' permalink' extnames must be respected
...
This reverts a bit of the work @willnorris had made to support
extensionless permalinks. Using the ‘permalink’ front matter will no
longer work as it must allow non-html extensions to be written.
2016-01-18 13:45:17 -08:00
5cf5ce979f
test: add assert_exist and refute_exist
2016-01-18 13:42:03 -08:00
0daafd7bda
Merge pull request #4361 from jekyll/pheuko-empty-permalink
...
Merge pull request 4361
2016-01-15 16:19:22 -08:00
06fa14c11a
Restructure data validation so that permalink check raises an error.
2016-01-15 16:11:08 -08:00
15a2dacd37
Merge pull request #4359 from jekyll/optimize-drop
...
Fix deep_merge_hashes! handling of drops and hashes
2016-01-15 15:19:18 -08:00
ea9cac5214
Add a nasty hack to reduce persistence until RSpec.
2016-01-15 14:15:28 -06:00
0587a3bb57
Fix some debug logging.
...
- excluded? should now only print when it is excluded
- requiring is now properly aligned
2016-01-15 11:30:02 -08:00
5d79c55b2c
Fix deep_merge_hashes! handling of drops and hashes
2016-01-15 11:22:39 -08:00
156e093b5c
Ensure no errors when there is no permalink
2016-01-15 14:40:59 -02:00
f8a63157d7
Empty permalink now shows an error
2016-01-15 14:40:47 -02:00
ba017ebb97
Remove old Fixme note
2016-01-11 22:32:04 -08:00
55423e344e
Add CodeClimate to the testing stuff.
2016-01-10 11:18:46 -06:00
735554007c
Merge pull request #4314 from jekyll/allow-custom-php-extensions
...
Merge pull request 4314
2016-01-09 18:11:47 -08:00
ddf640e6bd
Test all the things
2016-01-08 17:10:36 -08:00
acb2263f51
Add smartify filter
2016-01-07 02:36:24 -08:00
b6c283a4ae
wip: allow custom extensions
2016-01-04 17:42:06 -08:00
cb5bc1093e
utils: has_yaml_header? should accept files with extraneous spaces
...
Occasionally, extra spaces at the end of the YAML front matter prologue are
saved to a file and it goes missing without telling the user why. This
should simply accept those changes without any detriment to the user,
allowing anyone to add as many spaces as they like to the end of their
front matter prologues.
2016-01-04 14:09:30 -08:00
5bf596b239
utils/drops: update Drop to support Utils.deep_merge_hashes
...
Fixes #4287
2015-12-27 08:06:37 -05:00
69a6323599
Utils.deep_merge_hashes failing test
2015-12-27 07:48:45 -05:00
a47ce7b655
Wrap Arguments in () when used in a setter
2015-12-26 12:48:20 -08:00
d070a77716
url: fix issue with bad URL escaping when using Drop
2015-12-24 15:07:20 -05:00
cd2688ab66
test_excerpt & _page: use Drop instead of Hash to mock payload
2015-12-22 22:37:48 -05:00
645a2cc664
test/test_doctor_command.rb: fix test for Doctor.urls_only_differ_by_case
2015-12-14 20:59:52 -08:00
115926fd54
Change TestDoctorCommand to JekyllUnitTest since Test constant doesn't necessarily exist
2015-12-14 21:58:36 -05:00
fdcd761313
Merge branch 'akoeplinger-doctor-permalink-same-case-warning'
...
* akoeplinger-doctor-permalink-same-case-warning:
Added tests for new jekyll doctor warning
Incorporate code review feedback
Incorporate code review feedback
Add a Jekyll doctor warning for URLs that only differ by case
2015-12-13 12:26:07 -08:00
92adfd0e46
Merge pull request #4052 from Crunch09/process-empty-config-files
...
Merge pull request 4052
2015-12-11 14:11:11 -08:00
4f21458b34
Merge pull request #4184 from ducktyper/allow-quoted-dates
...
Merge pull request 4184
2015-12-11 14:02:55 -08:00
c6255d5f28
Merge pull request #4223 from jekyll/pull/sample-filter
...
Merge pull request 4223
2015-12-04 14:12:18 -08:00
8efbdc01ff
Fix #3791/#3478
...
* Add support for SSL through command line switches.
* Add suppport for file/index.html > file.html > directory.
* Add support for custom-headers through configuration.
* Modernize and split up the serve.
* Add a few basic tests.
2015-12-04 14:07:07 -06:00
2e91d094e5
filters#sample: n == 1, return item; n > 1, return array
2015-12-04 10:25:13 -08:00
28c568386d
Merge pull request #4220 from jekyll/pull/enable-codeclimate-platform
...
Fix : #4219 : Add CodeClimate Platform.
2015-12-04 12:08:00 -06:00
b6de905ee4
Fix : #4219 : Add CodeClimate Platform.
2015-12-04 11:42:52 -06:00
86195655d7
filters: allow sample(n) instead of just sample(1)
2015-12-04 09:40:57 -08:00
96bc62c666
Add 'sample' Liquid filter
...
Equivalent to Array#sample functionality
2015-12-04 09:33:33 -08:00
6cbd06ea85
Merge pull request #4109 from jekyll/cleanup-kramdown-converter
...
Merge pull request 4109
2015-12-04 09:21:22 -08:00
3432fd2c2d
Modernize Kramdown for Markdown converter.
2015-12-04 08:09:08 -06:00
b90f8e048a
Merge pull request #4150 from ducktyper/master
...
Merge pull request 4150
2015-11-30 19:57:01 -08:00
e60e5f3532
Allow quoted date in front matter defaults
2015-11-25 23:18:33 +13:00
ac1b2b88d4
Merge pull request #4160 from jekyll/fix-html-htm-xhtml-pages
...
Merge pull request 4160
2015-11-24 16:19:46 -08:00
a7730914df
rename `@options` in HighlightBlock (clash with Liquid::Block). fixes #4173
2015-11-24 20:24:44 +11:00
e9f8b4df74
Add Windows support to Utils.safe_glob
2015-11-19 17:15:51 +13:00
90865d5fc1
Fix #4082 : Allow users to use .htm and .xhtml (XHTML5.)
2015-11-18 16:02:03 -06:00
a168edae45
Add Utils.safe_glob method
...
which works the same way as Dir.glob but seperating the input
into two parts ('dir' + '/' + 'pattern') to make sure
the first part('dir') does not act as a pattern.
2015-11-19 00:46:46 +13:00
6a98ab2a15
Make `:title` cased for backwards compability and add `:slug` for uncased usage.
2015-11-18 10:43:13 +08:00
db6103bdee
Document: only superdirectories of the collection are categories
2015-11-04 15:18:02 +07:00
9d1641f163
Fix #3371 - kramdown:syntax_highlighter should automatically take value of highlighter
2015-10-31 23:58:49 +00:00
3b55bd1a51
Trim trailing whitespace.
...
[ci skip]
2015-10-30 21:57:14 +02:00
71f4383d18
Fix #4075 : Make sure that .jekyll-metadata is not generated when not needed.
2015-10-29 15:44:38 -05:00
dfae4669e4
AUTOMATIC: Whitespace stripped.
2015-10-29 15:43:55 -05:00
e5f26b5a36
Fix test warnings when doing rake {test,spec} or script/test
2015-10-29 15:18:19 -05:00
cf71c563ab
Handle empty config files
...
SafeYAML.load_file returns `false` when processing empty files so we
convert this into an empty hash for further processing.
fixes #4030
2015-10-28 22:31:42 +01:00
Frank Taillandier
Pat Hawks
Ashwin Maroli
Florian Thomas
Parker Moore
jekyllbot
Thiago Arrais
XhmikosR
jona
Eldritch Cheese
Tim Banks
Anatoliy Yastreb
Heng Kwokfu
Nicolas Porcel
Eloy Espinaco
Jeff Kolesky
David Zhang
Marko Locher
Marcus Stollsteimer
Brint O'Hearn
Jordon Bedwell
Thomas Wood
Jussi Kinnula
Pierre Fenoll
Ben Balter
Shinn Kondo
Tom Fejfar
Saleem Rashid
timwis
Tony Garnock-Jones
Henry Goodman
atomicules
Alfred Xing
rebornix
Zshawn Syed
Pedro Euko
Nick Quaranto
Ducksan Cho
Tim Cuthbertson
Paul Robert Lloyd