parent
483f738a0f
commit
f1c1091162
2 changed files with 1 additions and 7 deletions
|
|
@ -8,6 +8,7 @@
|
||||||
* Reduce conversation recipient size [#7376](https://github.com/diaspora/diaspora/pull/7376)
|
* Reduce conversation recipient size [#7376](https://github.com/diaspora/diaspora/pull/7376)
|
||||||
* Cleanup rtl css [#7374](https://github.com/diaspora/diaspora/pull/7374)
|
* 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)
|
* 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
|
## Bug fixes
|
||||||
* Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379)
|
* Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379)
|
||||||
|
|
|
||||||
|
|
@ -95,13 +95,6 @@ When /^(?:|I )attach the file "([^"]*)" to (?:hidden )?"([^"]*)"(?: within "([^"
|
||||||
end
|
end
|
||||||
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|
|
Then /^(?:|I )should see (\".+?\"[\s]*)(?:[\s]+within[\s]* "([^"]*)")?$/ do |vars, selector|
|
||||||
vars.scan(/"([^"]+?)"/).flatten.each do |text|
|
vars.scan(/"([^"]+?)"/).flatten.each do |text|
|
||||||
with_scope(selector) do
|
with_scope(selector) do
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue