Skip to content

Merge upstream #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
akitakun wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Merge upstream #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4704fe6
Add comment!
akitakun May 20, 2017
227961c
Merge pull request #1 from tops29/test
akitakun May 20, 2017
35ec26a
Merge pull request #2 from axsh/master
akitakun Jun 3, 2017
20835cc
Update webapi_integration_spec.rb
akitakun Jun 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions spec_integration/spec/webapi_integration_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

# -*- coding: utf-8 -*-

require 'yaml'
Expand Down Expand Up @@ -37,6 +38,8 @@
end
end



# describe 'update' do
# before do
# comment_params[:comment] = "webapi sample message 2"
Expand Down
4 changes: 3 additions & 1 deletion webapi/config-webapi.ru
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@

# -*- coding: utf-8 -*-
# HELLO!!

$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)

Expand Down Expand Up @@ -32,4 +34,4 @@ map '/api' do
map '/0.0.1' do
run Webapi::Endpoints::V001::Webapi.new
end
end
end