lurker 0.6.8 → 1.0.0

data/features/controller_nested_schema_scaffolding.feature

@@ -5,8 +5,6 @@ Feature: controller nested schema scaffolding
   Scenario: scaffold a json schema for a "repos/index" in a nested controller spec
     Given a file named "spec/controllers/api/v1/repos_controller_spec.rb" with:
       """ruby
-      require "spec_helper"
-
       describe Api::V1::ReposController, :lurker do
         render_views
 
@@ -18,7 +16,9 @@ Feature: controller nested schema scaffolding
         end
 
         it "lists all the repos of the user" do
-          get :index, user_id: user.id, limit: 1, format: 'json'
+          # rails 4 doesn't stringify values and schema has integers
+          # rails >= 5 have limit as string & proper query_params extension
+          get :index, params: { user_id: user.id, limit: 1, format: 'json' }
           expect(response).to be_success
           expect(JSON.parse(response.body).size).to eq 1
         end
@@ -28,7 +28,7 @@ Feature: controller nested schema scaffolding
   When I run `bin/rspec spec/controllers/api/v1/repos_controller_spec.rb`
   Then the example should pass
   Then a file named "lurker/api/v1/users/__user_id/repos-GET.json.yml" should exist
-  Then the file "lurker/api/v1/users/__user_id/repos-GET.json.yml" should contain exactly:
+  Then the file "lurker/api/v1/users/__user_id/repos-GET.json.yml" should contain:
     """yml
     ---
     description: repo listing
@@ -40,9 +40,9 @@ Feature: controller nested schema scaffolding
       required: []
       properties:
         limit:
-          description: ''
-          type: integer
-          example: 1
+    """
+  Then the file "lurker/api/v1/users/__user_id/repos-GET.json.yml" should contain:
+    """yml
     responseCodes:
     - status: 200
       successful: true
@@ -74,8 +74,5 @@ Feature: controller nested schema scaffolding
         controller: api/v1/repos
         action: index
         user_id: '1'
-      query_params:
-        limit: 1
-
     """
 

data/features/controller_schema_scaffolding.feature

@@ -7,8 +7,6 @@ Feature: controller schema scaffolding
   Scenario: scaffold a json schema for a "users/show" in controller spec
     Given a file named "spec/controllers/api/v1/users_controller_spec.rb" with:
       """ruby
-      require "spec_helper"
-
       describe Api::V1::UsersController, :lurker do
         render_views
 
@@ -17,7 +15,7 @@ Feature: controller schema scaffolding
         end
 
         it "shows user" do
-          get :show, id: user.id, format: 'json'
+          get :show, params: { id: user.id, format: 'json' }
           expect(response).to be_success
         end
       end

data/features/dereferencing_through_inlining.feature

@@ -55,8 +55,6 @@ Feature: $ref defererencing through inlining
       """
     And a file named "spec/controllers/api/v3/users_controller_spec.rb" with:
       """ruby
-        require "spec_helper"
-
         describe Api::V3::UsersController, :lurker do
           render_views
 
@@ -65,7 +63,7 @@ Feature: $ref defererencing through inlining
           end
 
           it "updates a user surname as string" do
-            patch :update, id: user.id, user: { surname: 'Marley' }
+            patch :update, params: { id: user.id, user: { surname: 'Marley' } }
             expect(response).to be_success
           end
         end

data/features/html_generation.feature

@@ -2,12 +2,24 @@ Feature: html generation
 
   Lurker generates pretty info pages based on schema information
   and form which allow you to test live api.
-  When testing your api ensure that CSRF protection is handled properlya
+  When testing your api ensure that CSRF protection is handled properly
   with `protect_from_forgery :null_session`
 
   @javascript
   Scenario: json schema gets generated into html preview using "users/create"
     Given an empty directory named "public/lurker"
+    And a service file with:
+      """yml
+      ---
+      name: Lurker Demo Application
+      basePath: ''
+      description: ''
+      domains:
+        'razum2um.me': 'https://lurker.razum2um.me'
+      consumes:
+      - application/x-www-form-urlencoded
+      - application/json
+      """
     And a file named "lurker/api/v1/users-POST.json.yml" with:
       """yml
       ---
@@ -48,8 +60,8 @@ Feature: html generation
             Converting lurker to html
      using  lurker
 
-    create  public/lurker/index.html
-    create  public/lurker/api/v1/users-POST.html
+    public/lurker/index.html
+    public/lurker/api/v1/users-POST.html
     """
 
   When I go to "/lurker"
@@ -62,7 +74,7 @@ Feature: html generation
   And I fill in the submit form field "name" with "Jim"
   Then I should see:
     """
-    curl -X POST -d "user%5Bname%5D=Jim"
+    curl -X POST -d 'user%5Bname%5D=Jim'
     """
 
    And I submit lurk form
@@ -74,3 +86,13 @@ Feature: html generation
 
   Then I should see JSON response with "can't be blank"
 
+  When I select "application/json" request media type
+   And I fill in the submit form field "name" with "Jim"
+  Then I should see:
+    """
+    curl -X POST -H 'Content-Type: application/json' -d '{"user":{"name":"Jim"}}'
+    """
+
+   And I submit lurk form
+
+  Then I should see JSON response with "Jim"

data/features/minitest.feature

@@ -49,10 +49,8 @@ Feature: minitest
       description: ''
     responseParameters:
       description: ''
-      type: object
-      additionalProperties: false
-      required: []
-      properties: {}
+      type: boolean
+      example: true
     extensions:
       method: DELETE
       path_info: "/api/v1/users/1/repos/1.json"
@@ -72,9 +70,6 @@ Feature: minitest
       description: 'user updating'
       requestParameters:
         properties:
-          id:
-            type: integer
-            example: 1
           user:
             type: object
             properties:
@@ -115,7 +110,7 @@ Feature: minitest
           assert_equal 1, User.count
 
           Lurker::Spy.on do
-            patch "/api/v1/users/#{user.id}.json", user: { name: '' }
+            patch "/api/v1/users/#{user.id}.json", params: { user: { name: '' } }
           end
 
           assert_equal 200, status

data/features/multidomain_support.feature

@@ -22,8 +22,7 @@ Feature: mutidomain support
       basePath: ''
       description: ''
       domains:
-        '[Sandbox] Heroku': 'http://lurker-app.herokuapp.com'
-        '[Real] razum2um.me': 'http://lurker.razum2um.me'
+        'razum2um.me': 'https://lurker.razum2um.me'
       name: Lurker Demo Application
       extensions: {}
       """
@@ -33,10 +32,7 @@ Feature: mutidomain support
       prefix: users management
       description: user deletion
       requestParameters:
-        properties:
-          id:
-            type: integer
-            example: 1
+        properties: {}
       responseCodes:
       - status: 200
         successful: true
@@ -58,14 +54,14 @@ Feature: mutidomain support
             Converting lurker to html
      using  lurker
 
-    create  public/lurker/index.html
-    create  public/lurker/api/v1/users/__id-DELETE.html
+    public/lurker/index.html
+    public/lurker/api/v1/users/__id-DELETE.html
     """
 
   When I go to "/lurker/api/v1/users/__id-DELETE.html"
-  When I select "[Sandbox] Heroku" hostname
+  When I select "razum2um.me" hostname
   Then I should see:
     """
-    curl -X DELETE "http://lurker-app.herokuapp.com/api/v1/users/1"
+    curl -X DELETE 'https://lurker.razum2um.me/api/v1/users/1'
     """
 

data/features/multitype_request_support.feature

@@ -60,8 +60,6 @@ Feature: multitype request support
   Scenario: json schema tests response parameters and update request parameters using "users/update"
     Given a file named "spec/controllers/api/v2/users_controller_spec.rb" with:
       """ruby
-        require "spec_helper"
-
         describe Api::V2::UsersController, :lurker do
           render_views
 
@@ -70,7 +68,7 @@ Feature: multitype request support
           end
 
           it "updates a user surname as string" do
-            patch :update, id: user.id, user: { surname: 'Marley' }
+            patch :update, params: { id: user.id, user: { surname: 'Marley' } }
             expect(response).to be_success
           end
         end

data/features/partials.feature

@@ -44,9 +44,6 @@ Feature: partials
       prefix: repos management
       requestParameters:
         properties:
-          user_id:
-            type: string
-            example: 1
           repo:
             properties:
               name:
@@ -68,8 +65,6 @@ Feature: partials
 
     Given a file named "spec/requests/repo_creation_spec.rb" with:
       """ruby
-      require "spec_helper"
-
       describe Api::V1::ReposController, :lurker do
         let!(:user) do
           User.where(name: 'razum2um').first_or_create!
@@ -77,7 +72,7 @@ Feature: partials
 
         it "creates a new repo" do
           expect {
-            post "/api/v1/users/#{user.id}/repos.json", repo: { name: 'new-gem' }
+            post "/api/v1/users/#{user.id}/repos.json", params: { repo: { name: 'new-gem' } }
             expect(response).to be_success
             expect(JSON.parse(response.body)['user']).to eq JSON.parse(user.to_json)
           }.to change { Repo.count } .by(1)
@@ -94,7 +89,7 @@ Feature: partials
             Converting lurker to html
      using  lurker
 
-    create  public/lurker/index.html
-    create  public/lurker/api/v1/users/__user_id/repos-POST.html
+    public/lurker/index.html
+    public/lurker/api/v1/users/__user_id/repos-POST.html
     """
 

data/features/request_nested_schema_scaffolding.feature

@@ -5,8 +5,6 @@ Feature: request nested schema scaffolding
   Scenario: scaffold a json schema for a "repos/show" in a nested controller spec
     Given a file named "spec/requests/repos_spec.rb" with:
       """ruby
-      require "spec_helper"
-
       describe Api::V1::ReposController, :lurker do
         let!(:user) do
           User.where(name: 'razum2um').first_or_create!.tap do |u|

data/features/request_schema_scaffolding.feature

@@ -7,8 +7,6 @@ Feature: request schema scaffolding
   Scenario: scaffold a json schema for a "users/index" in request spec
     Given a file named "spec/requests/users_spec.rb" with:
       """ruby
-      require "spec_helper"
-
       describe Api::V1::UsersController, :lurker do
         let!(:user) do
           User.where(name: 'razum2um', surname: 'Marley').first_or_create!

data/features/schema_suffixes.feature

@@ -17,12 +17,6 @@ Feature: schema suffixes
       description: 'repo updating'
       requestParameters:
         properties:
-          id:
-            type: string
-            example: 1
-          user_id:
-            type: string
-            example: razum2um
           repo:
             type: object
             properties:
@@ -56,8 +50,6 @@ Feature: schema suffixes
       """
     And a file named "spec/requests/updating_repos_spec.rb" with:
       """ruby
-      require "spec_helper"
-
       describe Api::V1::ReposController, :lurker, type: :request do
 
         let(:user) do
@@ -70,7 +62,7 @@ Feature: schema suffixes
 
         it "updates a repo name" do
           expect {
-            patch "/api/v1/users/#{user.name}/repos/#{repo.name}.json", repo: { name: 'updated-name' }
+            patch "/api/v1/users/#{user.name}/repos/#{repo.name}.json", params: { repo: { name: 'updated-name' } }
             expect(response).to be_success
           }.to change { repo.reload.name } .from('lurker').to('updated-name')
         end
@@ -88,12 +80,6 @@ Feature: schema suffixes
       description: 'failed repo updating'
       requestParameters:
         properties:
-          id:
-            type: string
-            example: 1
-          user_id:
-            type: string
-            example: razum2um
           repo:
             type: object
             properties:
@@ -127,8 +113,6 @@ Feature: schema suffixes
       """
     And a file named "spec/requests/failed_updating_repos_spec.rb" with:
       """ruby
-      require "spec_helper"
-
       describe Api::V1::ReposController, type: :request do
 
         let(:user) do
@@ -141,7 +125,7 @@ Feature: schema suffixes
 
         it "fails to update a repo with a blank name", lurker: 'failed' do
           expect {
-            patch "/api/v1/users/#{user.name}/repos/#{repo.name}.json", repo: { name: '' }
+            patch "/api/v1/users/#{user.name}/repos/#{repo.name}.json", params: { repo: { name: '' } }
             expect(response).not_to be_success
           }.not_to change { repo.reload.name }
         end

data/features/schema_updating_within_test_suite.feature

@@ -62,8 +62,6 @@ Feature: schema updating within test suite
   Scenario: json schema tests response parameters and request parameters and show errors from both using "users/update"
   Given a file named "spec/controllers/api/v2/users_controller_blank_spec.rb" with:
     """ruby
-      require "spec_helper"
-
       describe Api::V2::UsersController, :lurker do
         render_views
 
@@ -72,7 +70,7 @@ Feature: schema updating within test suite
         end
 
         it "updates a user surname as string" do
-          patch :update, id: user.id, user: { name: '', surname: 'Marley' }
+          patch :update, params: { id: user.id, user: { name: '', surname: 'Marley' } }
           expect(response).not_to be_success
         end
       end
@@ -93,8 +91,6 @@ Feature: schema updating within test suite
   Scenario: json schema tests response parameters and update request parameters using "users/update"
   Given a file named "spec/controllers/api/v2/users_controller_spec.rb" with:
     """ruby
-      require "spec_helper"
-
       describe Api::V2::UsersController, :lurker do
         render_views
 
@@ -103,7 +99,7 @@ Feature: schema updating within test suite
         end
 
         it "updates a user surname as string" do
-          patch :update, id: user.id, user: { surname: 'Marley' }
+          patch :update, params: { id: user.id, user: { surname: 'Marley' } }
           expect(response).to be_success
         end
       end

data/features/step_definitions/additional_cli_steps.rb

@@ -2,17 +2,14 @@ Given /^a checked file "([^"]*)" with:$/ do |file_name, file_content|
   write_file(file_name, file_content)
 
   @files ||= {}
-  in_current_dir { @files[md5(file_name)] = checksum(file_name) }
-end
-
-Given /^an empty directory named "([^"]*)"$/ do |dir_name|
-  in_current_dir { _rm_rf(dir_name) }
-  create_dir(dir_name)
+  in_current_directory { @files[md5(file_name)] = checksum(file_name) }
 end
 
 Given /^a service file with:$/ do |file_content|
-  in_current_dir do
-    write_file("#{Lurker::DEFAULT_SERVICE_PATH}/#{Rails.application.class.parent_name}#{Lurker::Service::SUFFIX}", file_content)
+  in_current_directory do
+    rails_app_class = Rails.application.class
+    rails_app_name = rails_app_class.respond_to?(:module_parent_name) ? rails_app_class.module_parent_name : rails_app_class.parent_name
+    write_file("#{Lurker::DEFAULT_SERVICE_PATH}/#{rails_app_name}#{Lurker::Service::SUFFIX}", file_content)
   end
 end
 
@@ -30,7 +27,14 @@ When /^I select "([^"]*)" hostname$/ do |host|
   end
   # FIXME: see multidomain feature - cannot select node in phantomjs
   page.execute_script("window.submitForm.setState({host: jQuery('#hostname').val()});")
-  page.execute_script("window.submitForm.afterSetPartialState()")
+end
+
+When /^I select "([^"]*)" request media type$/ do |type|
+  within(:xpath, "//*[@id='requestMediaType']") do
+    select(type)
+  end
+  # FIXME: cannot select node in phantomjs
+  page.execute_script("window.submitForm.setState({requestMediaType: jQuery('#requestMediaType').val()});")
 end
 
 When(/^I fill in the submit form field "([^"]*)" with "([^"]*)"$/) do |field, name|
@@ -76,7 +80,7 @@ end
 Then /^the output should contain (failures|these lines):$/ do |_, lines|
   out = all_output.dup
   lines.split(/\n/).map(&:strip).each do |line|
-    next if line.blank?
+    next if line.strip!.blank?
     expect(out).to match /#{Regexp.escape(line)}/
     out.gsub!(/.*?#{Regexp.escape(line)}/m, '')
   end
@@ -98,13 +102,13 @@ Then(/^I should see JSON response with "([^"]*)"$/) do |name|
 end
 
 Then /(?:a|the) checked file "([^"]*)" should not change$/ do |file_name|
-  in_current_dir do
+  in_current_directory do
     expect(@files.try(:[], md5(file_name))).to eq checksum(file_name)
   end
 end
 
 Then /(?:a|the) checked file "([^"]*)" should change$/ do |file_name|
-  in_current_dir do
+  in_current_directory do
     expect(@files.try(:[], md5(file_name))).not_to eq checksum(file_name)
   end
 end