Update development dependencies

Some tests needed updating for newer versions of gems
GenomeUS · Feb 1, 2016 · 08efda5 · 08efda5
1 parent 4235706
commit 08efda5
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 65 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -5,7 +5,7 @@ PATH
       activesupport (>= 3.0.0)
       json (~> 1.4, >= 1.4.6)
       mustache (~> 1.0, >= 0.99.4)
-      rspec (>= 3.0.0)
+      rspec (~> 3.0, >= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
@@ -16,40 +16,50 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.6)
-    aruba (0.6.1)
-      childprocess (>= 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
-    attr_required (1.0.0)
+    addressable (2.4.0)
+    aruba (0.13.0)
+      childprocess (~> 0.5.6)
+      contracts (~> 0.9)
+      cucumber (>= 1.3.19)
+      ffi (~> 1.9.10)
+      rspec-expectations (>= 2.99)
+      thor (~> 0.19)
+    attr_required (1.0.1)
     builder (3.2.2)
-    capybara (2.4.4)
+    capybara (2.6.2)
+      addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.5.5)
+    childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.0)
-    crack (0.4.2)
+    contracts (0.13.0)
+    crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    cucumber (1.3.19)
+    cucumber (2.3.2)
       builder (>= 2.1.2)
+      cucumber-core (~> 1.4.0)
+      cucumber-wire (~> 0.0.1)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
+      gherkin (~> 3.2.0)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
-    daemons (1.1.9)
+    cucumber-core (1.4.0)
+      gherkin (~> 3.2.0)
+    cucumber-wire (0.0.1)
+    daemons (1.2.3)
     diff-lcs (1.2.5)
-    eventmachine (1.0.7)
+    eventmachine (1.0.9.1)
     fakefs (0.6.0)
-    faraday (0.9.0)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.6)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    httpclient (2.5.3.2)
+    ffi (1.9.10)
+    gherkin (3.2.0)
+    hashdiff (0.2.3)
+    httpclient (2.7.1)
     i18n (0.7.0)
     inch (0.7.0)
       pry
@@ -58,31 +68,33 @@ GEM
       yard (~> 0.8.7.5)
     json (1.8.3)
     method_source (0.8.2)
-    mime-types (2.4.3)
-    mini_portile (0.6.1)
+    mime-types (3.0)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2015.1120)
+    mini_portile2 (2.0.0)
     minitest (5.8.4)
-    multi_json (1.11.0)
+    multi_json (1.11.2)
     multi_test (0.1.2)
     multipart-post (2.0.0)
     mustache (1.0.2)
-    nokogiri (1.6.4.1)
-      mini_portile (~> 0.6.0)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.5.2)
-    rack-oauth2 (1.0.8)
+    rack (1.6.4)
+    rack-oauth2 (1.2.2)
       activesupport (>= 2.3)
       attr_required (>= 0.0.5)
-      httpclient (>= 2.2.0.2)
+      httpclient (>= 2.4)
       multi_json (>= 1.3.6)
       rack (>= 1.1)
     rack-protection (1.5.3)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rake (10.3.2)
+    rake (10.5.0)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -92,34 +104,36 @@ GEM
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
-    rspec-its (1.1.0)
+    rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
     rspec-mocks (3.4.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
     safe_yaml (1.0.4)
-    sinatra (1.4.5)
-      rack (~> 1.4)
+    sinatra (1.4.7)
+      rack (~> 1.5)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
+      tilt (>= 1.3, < 3)
     slop (3.6.0)
     sparkr (0.4.1)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
-    thin (1.6.3)
+    thin (1.6.4)
       daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0)
+      eventmachine (~> 1.0, >= 1.0.4)
       rack (~> 1.0)
+    thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (1.4.1)
+    tilt (2.0.2)
     tins (1.8.2)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    webmock (1.20.4)
+    webmock (1.22.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
+      hashdiff
     xpath (2.0.0)
       nokogiri (~> 1.3)
     yard (0.8.7.6)
@@ -129,18 +143,18 @@ PLATFORMS
 
 DEPENDENCIES
   aruba (~> 0.5)
-  bundler
+  bundler (~> 1.0)
   capybara (~> 2.2)
   fakefs (~> 0.4)
-  faraday (>= 0.9.0)
+  faraday (~> 0.9, >= 0.9.0)
   inch
-  rack-oauth2 (~> 1.0.7)
+  rack-oauth2 (~> 1.2.2, >= 1.0.7)
   rack-test (~> 0.6.2)
   rake (~> 10.1)
   rspec-its (~> 1.0)
   rspec_api_documentation!
-  sinatra (~> 1.4.4)
-  thin
+  sinatra (~> 1.4, >= 1.4.4)
+  thin (~> 1.6, >= 1.6.3)
   webmock (~> 1.7)
 
 BUNDLED WITH

diff --git a/features/markdown_documentation.feature b/features/markdown_documentation.feature
@@ -158,8 +158,6 @@ Feature: Generate Markdown documentation from test examples
     * [Getting a list of orders](orders/getting_a_list_of_orders.markdown)
     * [Getting a specific order](orders/getting_a_specific_order.markdown)
     * [Updating an order](orders/updating_an_order.markdown)
-
-
     """
 
   Scenario: Example 'Getting al ist of orders' file should look like we expect
@@ -262,8 +260,6 @@ Feature: Generate Markdown documentation from test examples
     #### Status
 
     <pre>201 Created</pre>
-
-
     """
 
   Scenario: Example 'Deleting an order' file should be created

diff --git a/features/step_definitions/image_steps.rb b/features/step_definitions/image_steps.rb
@@ -1,8 +1,8 @@
 Given /^I move the sample image into the workspace$/ do
-  FileUtils.cp("features/fixtures/file.png", current_dir)
+  FileUtils.cp("features/fixtures/file.png", expand_path("."))
 end
 
 Then /^the generated documentation should be encoded correctly$/ do
-  file = File.read(File.join(current_dir, "doc", "api", "foobars", "uploading_a_file.html"))
+  file = File.read(File.join(expand_path("."), "doc", "api", "foobars", "uploading_a_file.html"))
   expect(file).to match(/file\.png/)
 end
diff --git a/features/step_definitions/json_steps.rb b/features/step_definitions/json_steps.rb
@@ -1,6 +1,3 @@
 Then /^the file "(.*?)" should contain JSON exactly like:$/ do |file, exact_content|
-  prep_for_fs_check do
-    json = IO.read(file)
-    expect(JSON.parse(json)).to eq(JSON.parse(exact_content))
-  end
+  expect(JSON.parse(read(file).join)).to eq(JSON.parse(exact_content))
 end
diff --git a/features/textile_documentation.feature b/features/textile_documentation.feature
@@ -158,8 +158,6 @@ Feature: Generate Textile documentation from test examples
     * "Getting a list of orders":orders/getting_a_list_of_orders.textile
     * "Getting a specific order":orders/getting_a_specific_order.textile
     * "Updating an order":orders/updating_an_order.textile
-
-
     """
 
   Scenario: Example 'Getting al ist of orders' file should look like we expect
@@ -214,8 +212,6 @@ Feature: Generate Textile documentation from test examples
         }
       ]
     }</pre>
-
-
     """
 
   Scenario: Example 'Creating an order' file should look like we expect
@@ -263,8 +259,6 @@ Feature: Generate Textile documentation from test examples
     h4. Status
 
     <pre>201 Created</pre>
-
-
     """
 
   Scenario: Example 'Deleting an order' file should be created

diff --git a/rspec_api_documentation.gemspec b/rspec_api_documentation.gemspec
@@ -14,23 +14,23 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = ">= 1.3.6"
 
-  s.add_runtime_dependency "rspec", ">= 3.0.0"
+  s.add_runtime_dependency "rspec", "~> 3.0", ">= 3.0.0"
   s.add_runtime_dependency "activesupport", ">= 3.0.0"
   s.add_runtime_dependency "mustache", "~> 1.0", ">= 0.99.4"
   s.add_runtime_dependency "json", "~> 1.4", ">= 1.4.6"
 
-  s.add_development_dependency "bundler"
+  s.add_development_dependency "bundler", "~> 1.0"
   s.add_development_dependency "fakefs", "~> 0.4"
-  s.add_development_dependency "sinatra", "~> 1.4.4"
+  s.add_development_dependency "sinatra", "~> 1.4", ">= 1.4.4"
   s.add_development_dependency "aruba", "~> 0.5"
   s.add_development_dependency "capybara", "~> 2.2"
   s.add_development_dependency "rake", "~> 10.1"
   s.add_development_dependency "rack-test", "~> 0.6.2"
-  s.add_development_dependency "rack-oauth2", "~> 1.0.7"
+  s.add_development_dependency "rack-oauth2", "~> 1.2.2", ">= 1.0.7"
   s.add_development_dependency "webmock", "~> 1.7"
   s.add_development_dependency "rspec-its", "~> 1.0"
-  s.add_development_dependency "faraday", ">= 0.9.0"
-  s.add_development_dependency "thin"
+  s.add_development_dependency "faraday", "~> 0.9", ">= 0.9.0"
+  s.add_development_dependency "thin", "~> 1.6", ">= 1.6.3"
 
   s.files        = Dir.glob("lib/**/*") + Dir.glob("templates/**/*")
   s.require_path = "lib"

diff --git a/spec/dsl_spec.rb b/spec/dsl_spec.rb
@@ -240,7 +240,7 @@
     end
 
     describe "trigger_callback" do
-      let(:callback_url) { "callback url" }
+      let(:callback_url) { "http://example.com/callback-url" }
       let(:callbacks_triggered) { [] }
 
       trigger_callback do