Skip to content

Commit f1553b5

Browse files
committed
Replace spec fixtures site with mounted site
1 parent aa3ef6c commit f1553b5

34 files changed

+6
-270
lines changed

lib/jekyll-admin/server/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class Server < Sinatra::Base
1111
json({ :commit => commit_id })
1212
end
1313

14-
get "/publish/:collection_id/*?/?:path.:ext" do
14+
get "/publish/*?/?:path.:ext" do
1515
if git_repo
1616
publish_file path
1717
end

script/test-server

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ set -e
44

55
script/branding
66

7-
cd ./spec/fixtures/site || exit
8-
RACK_ENV=development bundle exec jekyll serve --verbose --watch --host 0.0.0.0
7+
RACK_ENV=development bundle exec jekyll serve --source ./spec/fixtures/site --verbose --watch --host 0.0.0.0

spec/fixtures/site

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../site

spec/fixtures/site/_config.yml

-44
This file was deleted.

spec/fixtures/site/_data/data_file.yml

-1
This file was deleted.

spec/fixtures/site/_data/members.csv

-3
This file was deleted.

spec/fixtures/site/_data/members.tsv

-3
This file was deleted.

spec/fixtures/site/_data/movies/actors.yml

-1
This file was deleted.

spec/fixtures/site/_data/movies/genres/fiction.yml

-1
This file was deleted.

spec/fixtures/site/_data/plain_text.txt

-6
This file was deleted.

spec/fixtures/site/_data/settings.json

-30
This file was deleted.

spec/fixtures/site/_data/template-config.yaml

-83
This file was deleted.

spec/fixtures/site/_drafts/draft-dir/WIP/yet-another-draft-post.md

-5
This file was deleted.

spec/fixtures/site/_drafts/draft-dir/another-draft-post.md

-5
This file was deleted.

spec/fixtures/site/_drafts/draft-post.md

-5
This file was deleted.

spec/fixtures/site/_drafts/random/notes.txt

-1
This file was deleted.

spec/fixtures/site/_posts/2016-01-01-test-post.md

-5
This file was deleted.

spec/fixtures/site/_posts/2016-02-01-test-post-2.md

-5
This file was deleted.

spec/fixtures/site/_posts/2016-03-01-test-post-3.md

-13
This file was deleted.

spec/fixtures/site/_posts/more posts/2016-04-01-post-within-subdirectory.md

-6
This file was deleted.

spec/fixtures/site/_posts/more posts/some more posts/2016-05-01-a-test-post-within-subdirectory.md

-6
This file was deleted.

spec/fixtures/site/_posts/more posts/some more posts/2016-05-02-another-test-post-within-subdirectory.md

-6
This file was deleted.

spec/fixtures/site/_puppies/rover.md

-4
This file was deleted.

spec/fixtures/site/assets/app.coffee

-4
This file was deleted.

spec/fixtures/site/assets/style.scss

-4
This file was deleted.

spec/fixtures/site/icon-github.svg

-1
This file was deleted.

spec/fixtures/site/index.html

-5
This file was deleted.
-46.1 KB
Binary file not shown.

spec/fixtures/site/page-dir/page1.md

-6
This file was deleted.

spec/fixtures/site/page-dir/test/page2.md

-5
This file was deleted.

spec/fixtures/site/page.md

-5
This file was deleted.

spec/fixtures/site/static-file.txt

-1
This file was deleted.

src/constants/api.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ export const staticfileAPIUrl = filename => `${API}/static_files/${filename}`;
3939

4040
export const verionsAPIUrl = () => `${API}/version`;
4141
export const versionsUpdateAPIUrl = () => `${API}/version/update`;
42-
export const versionsPublishAPIUrl = filename => `${API}/version/${filename}`;
42+
export const versionsPublishAPIUrl = filename => `${API}/version/publish/${filename}`;

src/ducks/collections.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ export const deleteDocument = (collection, directory, filename) => dispatch => {
163163
export const publishDocument = (path) => (dispatch, getState) => {
164164
return get(
165165
versionsPublishAPIUrl(path),
166-
{ type: FETCH_DOCUMENT_SUCCESS, name: 'doc' },
167-
{ type: FETCH_DOCUMENT_FAILURE, name: 'error' },
166+
{ type: DELETE_DOCUMENT_SUCCESS },
167+
{ type: DELETE_DOCUMENT_SUCCESS },
168168
dispatch
169169
);
170170
};

0 commit comments

Comments
 (0)