diff --git a/Changelog.md b/Changelog.md index 44ab4a2c0..b592f66d7 100644 --- a/Changelog.md +++ b/Changelog.md @@ -28,6 +28,7 @@ * Reduce conversation recipient size [#7376](https://github.com/diaspora/diaspora/pull/7376) * Cleanup rtl css [#7374](https://github.com/diaspora/diaspora/pull/7374) * Increase visual spacing between list items [#7401](https://github.com/diaspora/diaspora/pull/7401) +* Remove unused gem and cucumber step [#7410](https://github.com/diaspora/diaspora/pull/7410) ## Bug fixes * Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379) diff --git a/Gemfile b/Gemfile index ad42038d0..0479c5c6e 100644 --- a/Gemfile +++ b/Gemfile @@ -288,7 +288,6 @@ group :test do gem "poltergeist", "1.13.0" gem "cucumber-api-steps", "0.13", require: false - gem "json_spec", "1.1.4" # General helpers diff --git a/Gemfile.lock b/Gemfile.lock index a6f286fa2..caf3f15bb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -344,9 +344,6 @@ GEM url_safe_base64 json-schema (2.8.0) addressable (>= 2.4) - json_spec (1.1.4) - multi_json (~> 1.0) - rspec (>= 2.0, < 4.0) jsonpath (0.5.8) multi_json jwt (1.5.6) @@ -837,7 +834,6 @@ DEPENDENCIES js_image_paths (= 0.1.0) json (= 1.8.6) json-schema (= 2.8.0) - json_spec (= 1.1.4) leaflet-rails (= 0.7.7) logging-rails (= 0.5.0) markerb (= 1.1.0) diff --git a/features/step_definitions/web_steps.rb b/features/step_definitions/web_steps.rb index 74c1d0b42..f2c564c8f 100644 --- a/features/step_definitions/web_steps.rb +++ b/features/step_definitions/web_steps.rb @@ -95,13 +95,6 @@ When /^(?:|I )attach the file "([^"]*)" to (?:hidden )?"([^"]*)"(?: within "([^" end end -Then /^(?:|I )should see JSON:$/ do |expected_json| - require 'json' - expected = JSON.pretty_generate(JSON.parse(expected_json)) - actual = JSON.pretty_generate(JSON.parse(response.body)) - expected.should == actual -end - Then /^(?:|I )should see (\".+?\"[\s]*)(?:[\s]+within[\s]* "([^"]*)")?$/ do |vars, selector| vars.scan(/"([^"]+?)"/).flatten.each do |text| with_scope(selector) do diff --git a/features/support/env.rb b/features/support/env.rb index c26248a98..0fb5dede3 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -16,7 +16,6 @@ require "capybara/session" require "capybara/poltergeist" require "cucumber/api_steps" -require "json_spec/cucumber" # Ensure we know the appservers port Capybara.server_port = AppConfig.pod_uri.port