Merge upstream

spec_integration/spec/webapi_integration_spec.rb

@@ -37,20 +37,20 @@
     end
   end
 
-  # describe 'update' do
-  #   before do
-  #     comment_params[:comment] = "webapi sample message 2"
-  #   end
-  #   it 'update api not allowed' do
-  #     res = WebAPIClient::Comment.update(comment["id"], comment_params)
-  #     expect(res["code"]).to eq 405
-  #   end
-  # end
-
-  # describe 'delete' do
-  #   it 'delete api not allowed' do
-  #     res = WebAPIClient::Comment.delete(comment["id"])
-  #     expect(res["code"]).to eq 405
-  #   end
-  # end
+#  describe 'update' do
+#    before do
+#      comment_params[:comment] = "webapi sample message 2"
+#    end
+#    it 'update api not allowed' do
+#      res = WebAPIClient::Comment.update(comment["id"], comment_params)
+#      expect(res["code"]).to eq 405
+#    end
+#  end
+
+#  describe 'delete' do
+#    it 'delete api not allowed' do
+#      res = WebAPIClient::Comment.delete(comment["id"])
+#      expect(res["code"]).to eq 405
+#    end
+#  end
 end

webapi/config-webapi.ru

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# HELLO
 
 $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 
@@ -32,4 +33,4 @@ map '/api' do
   map '/0.0.1' do
     run Webapi::Endpoints::V001::Webapi.new
   end
-end
+end