From 483f738a0f7741c1a0e463bc5690324340dd1128 Mon Sep 17 00:00:00 2001
From: cmrd Senya <senya@riseup.net>
Date: Sat, 1 Apr 2017 15:46:28 +0300
Subject: [PATCH 1/2] Remove unused json_spec gem

---
 Gemfile                 | 1 -
 Gemfile.lock            | 4 ----
 features/support/env.rb | 1 -
 3 files changed, 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6db6ec2c8..1fb74a0e1 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 880e2415f..3241688a5 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/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

From f1c1091162b80c48919f0fe7d74f35f2edc62fd1 Mon Sep 17 00:00:00 2001
From: cmrd Senya <senya@riseup.net>
Date: Sat, 1 Apr 2017 15:47:02 +0300
Subject: [PATCH 2/2] Remove unused cucumber step

"should see JSON"

closes #7410
---
 Changelog.md                           | 1 +
 features/step_definitions/web_steps.rb | 7 -------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 29bab8493..bb31193ba 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,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/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