Merge pull request #52 from dblock/grape-version-matrix

Confirmed support for grape 0.14.x through 0.16.x and grape-swagger 0.11.x through 0.20.x.

Author: dblock

.travis.yml

@@ -17,6 +17,8 @@ rvm:
 env:
   - GRAPE_SWAGGER_VERSION=0.8.0
   - GRAPE_SWAGGER_VERSION=0.9.0
+  - GRAPE_SWAGGER_VERSION=0.11.0
+  - GRAPE_SWAGGER_VERSION=0.20.2
   - GRAPE_SWAGGER_VERSION=HEAD
 
 matrix:

CHANGELOG.md

@@ -1,8 +1,9 @@
 ### 0.2.1 (Next)
 
-* Your contribution here.
 * Fixed header-based authorization - [@davidbrewer](https://github.com/davidbrewer).
 * Support Swagger-UI validatorUrl option - [@davidbrewer](https://github.com/davidbrewer).
+* Support for grape 0.14.x through 0.16.x and grape-swagger 0.11.x through 0.20.x - [@dblock](https://github.com/dblock).
+* Your contribution here.
 
 ### 0.2.0 (February 23, 2016)
 

Gemfile

@@ -11,6 +11,12 @@ when '0.8.0'
 when '0.9.0'
   gem 'grape', '0.10.1'
   gem 'grape-swagger', '0.9.0'
+when '0.11.0'
+  gem 'grape', '0.16.2'
+  gem 'grape-swagger', '0.11.0'
+when '0.20.2'
+  gem 'grape', '0.14.0'
+  gem 'grape-swagger', '0.20.2'
 else
   gem 'grape-swagger', version
 end

spec/features/swagger_spec.rb

@@ -27,14 +27,14 @@
         expect(headers.select { |key| key.to_s.match(/^header/) }).not_to be_blank
         expect(headers.fetch('header_0', {}).fetch('name', {})).to eq GrapeSwaggerRails.options.headers.keys.first
         find('#endpointListTogger_headers', visible: true).click
-        first('a[href="#!/headers/GET_api_headers_format"]', visible: true).click
+        first('span[class="http_method"] a', visible: true).click
         click_button 'Try it out!'
         expect(page).to have_css 'span.attribute', text: 'X-Test-Header'
         expect(page).to have_css 'span.string', text: 'Test Value'
       end
       it 'supports multiple headers' do
         find('#endpointListTogger_headers', visible: true).click
-        first('a[href="#!/headers/GET_api_headers_format"]', visible: true).click
+        first('span[class="http_method"] a', visible: true).click
         click_button 'Try it out!'
         expect(page).to have_css 'span.attribute', text: 'X-Test-Header'
         expect(page).to have_css 'span.string', text: 'Test Value'
@@ -53,7 +53,7 @@
         page.execute_script("$('#input_apiKey').val('username:password')")
         page.execute_script("$('#input_apiKey').trigger('change')")
         find('#endpointListTogger_headers', visible: true).click
-        first('a[href="#!/headers/GET_api_headers_format"]', visible: true).click
+        first('span[class="http_method"] a', visible: true).click
         click_button 'Try it out!'
         expect(page).to have_css 'span.attribute', text: 'Authorization'
         expect(page).to have_css 'span.string', text: "Basic #{Base64.encode64('username:password').strip}"
@@ -70,7 +70,7 @@
         page.execute_script("$('#input_apiKey').val('token')")
         page.execute_script("$('#input_apiKey').trigger('change')")
         find('#endpointListTogger_headers', visible: true).click
-        first('a[href="#!/headers/GET_api_headers_format"]', visible: true).click
+        first('span[class="http_method"] a', visible: true).click
         click_button 'Try it out!'
         expect(page).to have_css 'span.attribute', text: 'Authorization'
         expect(page).to have_css 'span.string', text: 'Bearer token'
@@ -86,7 +86,7 @@
         page.execute_script("$('#input_apiKey').val('dummy')")
         page.execute_script("$('#input_apiKey').trigger('change')")
         find('#endpointListTogger_params', visible: true).click
-        first('a[href="#!/params/GET_api_params_format"]', visible: true).click
+        first('span[class="http_method"] a', visible: true).click
         click_button 'Try it out!'
         expect(page).to have_css 'span.attribute', text: 'api_token'
         expect(page).to have_css 'span.string', text: 'dummy'