Skip to content

Commit

Permalink
Merge pull request #336 from jekyll/unicode
Browse files Browse the repository at this point in the history
Fix travis
  • Loading branch information
mertkahyaoglu authored Mar 29, 2017
2 parents 53fb506 + ac646f2 commit 5509153
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ AllCops:
- lib/jekyll-admin/public/**/*
- src/**/*
- node_modules/**/*
- Gemfile
- jekyll-admin.gemspec

Metrics/BlockLength:
Enabled: false
2 changes: 1 addition & 1 deletion lib/jekyll-admin/server/collection.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module JekyllAdmin
class Server < Sinatra::Base
namespace "/collections" do
get do
json site.collections.map { |c| c[1].to_api }
json(site.collections.map { |c| c[1].to_api })
end

get "/:collection_id" do
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"redux-logger": "2.6.1",
"redux-thunk": "2.1.0",
"simplemde": "1.11.2",
"slug": "0.9.1",
"slug": "git+https://git@github.com/180-g/node-slug",
"sortablejs": "1.4.2",
"underscore": "1.8.3"
},
Expand Down
2 changes: 1 addition & 1 deletion spec/jekyll-admin/apiable_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
describe JekyllAdmin::APIable do
[:page, :post].each do |type|
%i(page post).each do |type|
context type do
subject do
documents = Jekyll.sites.first.send("#{type}s".to_sym)
Expand Down
4 changes: 2 additions & 2 deletions spec/jekyll-admin/server/collection_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ def app
context "entries" do
let(:entries) { last_response_parsed }
let(:documents) do
entries.select do |entry|
!entry.key? "type"
entries.reject do |entry|
entry.key? "type"
end
end
let(:first_document) { documents.first }
Expand Down
4 changes: 2 additions & 2 deletions spec/jekyll-admin/server/page_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ def app
context "page index" do
let(:entries) { last_response_parsed }
let(:pages) do
entries.select do |entry|
!entry.key? "type"
entries.reject do |entry|
entry.key? "type"
end
end
let(:first_page) { pages.first }
Expand Down
4 changes: 2 additions & 2 deletions spec/jekyll-admin/server_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ def app
get "/pages"
expect(last_response).to be_ok
entries = last_response_parsed
first_page = entries.select do |entry|
!entry.key? "type"
first_page = entries.reject do |entry|
entry.key? "type"
end.first
expect(first_page["path"]).to eq("page.md")
end
Expand Down

0 comments on commit 5509153

Please sign in to comment.