nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Dennis Schubert 2015-10-29 04:31:47 +01:00
commit 92c2a2e527
3 changed files with 48 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Gemfile
View file

@ -74,7 +74,7 @@ gem "activerecord-import", "0.10.0"
gem "carrierwave", "0.10.0" gem "carrierwave", "0.10.0"
gem "fog", "1.34.0" gem "fog", "1.34.0"
gem "mini_magick", "4.3.3" gem "mini_magick", "4.3.6"
gem "remotipart", "1.2.1" gem "remotipart", "1.2.1"
# GUID generation # GUID generation
@ -87,7 +87,7 @@ gem "entypo-rails", "3.0.0.pre.rc2"
# JavaScript # JavaScript
gem "backbone-on-rails", "1.2.0.0" gem "backbone-on-rails", "1.2.0.0"
gem "handlebars_assets", "0.20.2" gem "handlebars_assets", "0.21.0"
gem "jquery-rails", "4.0.5" gem "jquery-rails", "4.0.5"
gem "jquery-ui-rails", "5.0.5" gem "jquery-ui-rails", "5.0.5"
gem "js_image_paths", "0.0.2" gem "js_image_paths", "0.0.2"
@ -109,7 +109,7 @@ source "https://rails-assets.org" do
# jQuery plugins # jQuery plugins
gem "rails-assets-jeresig--jquery.hotkeys", "0.2.0" gem "rails-assets-jeresig--jquery.hotkeys", "0.2.0"
gem "rails-assets-jquery-placeholder", "2.1.2" gem "rails-assets-jquery-placeholder", "2.1.3"
gem "rails-assets-jquery-textchange", "0.2.3" gem "rails-assets-jquery-textchange", "0.2.3"
gem "rails-assets-perfect-scrollbar", "0.6.7" gem "rails-assets-perfect-scrollbar", "0.6.7"
gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11" gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11"
@ -134,7 +134,7 @@ gem "leaflet-rails", "0.7.4"
# Parsing # Parsing
gem "nokogiri", "1.6.6.2" gem "nokogiri", "1.6.6.2"
gem "redcarpet", "3.3.2" gem "redcarpet", "3.3.3"
gem "twitter-text", "1.13.0" gem "twitter-text", "1.13.0"
gem "roxml", "3.1.6" gem "roxml", "3.1.6"
gem "ruby-oembed", "0.8.14" gem "ruby-oembed", "0.8.14"
@ -164,7 +164,7 @@ gem "acts-as-taggable-on", "3.5.0"
# URIs and HTTP # URIs and HTTP
gem "addressable", "2.3.8", require: "addressable/uri" gem "addressable", "2.3.8", require: "addressable/uri"
gem "faraday", "0.9.1" gem "faraday", "0.9.2"
gem "faraday_middleware", "0.10.0" gem "faraday_middleware", "0.10.0"
gem "faraday-cookie_jar", "0.0.6" gem "faraday-cookie_jar", "0.0.6"
gem "typhoeus", "0.8.0" gem "typhoeus", "0.8.0"
@ -239,7 +239,7 @@ group :development do
# Linters # Linters
gem "jshintrb", "0.3.0" gem "jshintrb", "0.3.0"
gem "rubocop", "0.34.1" gem "rubocop", "0.34.2"
gem "haml_lint", "0.15.2" gem "haml_lint", "0.15.2"
gem "pronto", "0.4.3" gem "pronto", "0.4.3"
gem "pronto-jshint", "0.4.2" gem "pronto-jshint", "0.4.2"
@ -273,15 +273,15 @@ group :test do
# Cucumber (integration tests) # Cucumber (integration tests)
gem "capybara", "2.5.0" gem "capybara", "2.5.0"
gem "database_cleaner" , "1.5.0" gem "database_cleaner" , "1.5.1"
gem "selenium-webdriver", "2.47.1" gem "selenium-webdriver", "2.47.1"
# General helpers # General helpers
gem "factory_girl_rails", "4.5.0" gem "factory_girl_rails", "4.5.0"
gem "timecop", "0.8.0" gem "timecop", "0.8.0"
gem "webmock", "1.21.0", require: false gem "webmock", "1.22.1", require: false
gem "shoulda-matchers", "2.8.0", require: false gem "shoulda-matchers", "3.0.0"
end end
group :development, :test do group :development, :test do

62
Gemfile.lock
View file

@ -2,7 +2,7 @@ GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
remote: https://rails-assets.org/ remote: https://rails-assets.org/
specs: specs:
CFPropertyList (2.3.1) CFPropertyList (2.3.2)
actionmailer (4.2.4) actionmailer (4.2.4)
actionpack (= 4.2.4) actionpack (= 4.2.4)
actionview (= 4.2.4) actionview (= 4.2.4)
@ -134,7 +134,7 @@ GEM
mime-types (>= 1.16, < 3) mime-types (>= 1.16, < 3)
nokogiri (~> 1.5) nokogiri (~> 1.5)
rails (>= 3, < 5) rails (>= 3, < 5)
database_cleaner (1.5.0) database_cleaner (1.5.1)
devise (3.5.2) devise (3.5.2)
bcrypt (~> 3.0) bcrypt (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
@ -155,7 +155,7 @@ GEM
http_parser.rb (~> 0.6) http_parser.rb (~> 0.6)
nokogiri (~> 1.6) nokogiri (~> 1.6)
diaspora_federation (0.0.8) diaspora_federation (0.0.8)
faraday (~> 0.9.0) faraday (~> 0.9.2)
faraday_middleware (~> 0.10.0) faraday_middleware (~> 0.10.0)
nokogiri (~> 1.6, >= 1.6.6) nokogiri (~> 1.6, >= 1.6.6)
typhoeus (~> 0.7) typhoeus (~> 0.7)
@ -165,7 +165,7 @@ GEM
rails (~> 4.2) rails (~> 4.2)
diff-lcs (1.2.5) diff-lcs (1.2.5)
docile (1.1.5) docile (1.1.5)
domain_name (0.5.24) domain_name (0.5.25)
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
eco (1.0.0) eco (1.0.0)
coffee-script coffee-script
@ -196,7 +196,7 @@ GEM
factory_girl_rails (4.5.0) factory_girl_rails (4.5.0)
factory_girl (~> 4.5.0) factory_girl (~> 4.5.0)
railties (>= 3.0.0) railties (>= 3.0.0)
faraday (0.9.1) faraday (0.9.2)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6) faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4) faraday (>= 0.7.4)
@ -259,7 +259,7 @@ GEM
fog-ecloud (0.3.0) fog-ecloud (0.3.0)
fog-core fog-core
fog-xml fog-xml
fog-google (0.0.7) fog-google (0.1.1)
fog-core fog-core
fog-json fog-json
fog-xml fog-xml
@ -284,13 +284,13 @@ GEM
fog-core fog-core
fog-json fog-json
fog-xml fog-xml
fog-sakuracloud (1.1.1) fog-sakuracloud (1.3.3)
fog-core fog-core
fog-json fog-json
fog-serverlove (0.1.2) fog-serverlove (0.1.2)
fog-core fog-core
fog-json fog-json
fog-softlayer (0.4.7) fog-softlayer (1.0.0)
fog-core fog-core
fog-json fog-json
fog-storm_on_demand (0.1.1) fog-storm_on_demand (0.1.1)
@ -356,16 +356,17 @@ GEM
haml (~> 4.0) haml (~> 4.0)
rubocop (>= 0.25.0) rubocop (>= 0.25.0)
sysexits (~> 1.1) sysexits (~> 1.1)
handlebars_assets (0.20.2) handlebars_assets (0.21.0)
execjs (~> 2.0) execjs (~> 2.0)
multi_json (~> 1.0) multi_json (~> 1.0)
sprockets (>= 2.0.0, < 4.0) sprockets (>= 2.0.0, < 4.0)
tilt (~> 1.2) tilt (~> 1.2)
hashdiff (0.2.2)
hashie (3.4.2) hashie (3.4.2)
hike (1.2.3) hike (1.2.3)
hiredis (0.5.2) hiredis (0.5.2)
hitimes (1.2.3) hitimes (1.2.3)
http (0.9.6) http (0.9.8)
addressable (~> 2.3) addressable (~> 2.3)
http-cookie (~> 1.0) http-cookie (~> 1.0)
http-form_data (~> 1.0.1) http-form_data (~> 1.0.1)
@ -441,7 +442,7 @@ GEM
messagebus_ruby_api (1.0.3) messagebus_ruby_api (1.0.3)
method_source (0.8.2) method_source (0.8.2)
mime-types (2.6.2) mime-types (2.6.2)
mini_magick (4.3.3) mini_magick (4.3.6)
mini_portile (0.6.2) mini_portile (0.6.2)
minitest (5.8.1) minitest (5.8.1)
mobile-fu (1.3.1) mobile-fu (1.3.1)
@ -457,7 +458,7 @@ GEM
nested_form (0.3.2) nested_form (0.3.2)
net-scp (1.2.1) net-scp (1.2.1)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
net-ssh (2.9.2) net-ssh (3.0.1)
nio4r (1.1.1) nio4r (1.1.1)
nokogiri (1.6.6.2) nokogiri (1.6.6.2)
mini_portile (~> 0.6.0) mini_portile (~> 0.6.0)
@ -517,7 +518,7 @@ GEM
pronto-scss (0.4.7) pronto-scss (0.4.7)
pronto (~> 0.4.0) pronto (~> 0.4.0)
scss_lint (~> 0.41.0) scss_lint (~> 0.41.0)
pry (0.10.1) pry (0.10.3)
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.8.1) method_source (~> 0.8.1)
slop (~> 3.4) slop (~> 3.4)
@ -579,7 +580,7 @@ GEM
rails-assets-jquery-colorbox (1.6.3) rails-assets-jquery-colorbox (1.6.3)
rails-assets-jquery (>= 1.3.2) rails-assets-jquery (>= 1.3.2)
rails-assets-jquery-fullscreen-plugin (0.5.0) rails-assets-jquery-fullscreen-plugin (0.5.0)
rails-assets-jquery-placeholder (2.1.2) rails-assets-jquery-placeholder (2.1.3)
rails-assets-jquery (>= 1.6) rails-assets-jquery (>= 1.6)
rails-assets-jquery-textchange (0.2.3) rails-assets-jquery-textchange (0.2.3)
rails-assets-jquery rails-assets-jquery
@ -636,7 +637,7 @@ GEM
rb-fsevent (0.9.6) rb-fsevent (0.9.6)
rb-inotify (0.9.5) rb-inotify (0.9.5)
ffi (>= 0.5.0) ffi (>= 0.5.0)
redcarpet (3.3.2) redcarpet (3.3.3)
redis (3.2.1) redis (3.2.1)
redis-namespace (1.5.2) redis-namespace (1.5.2)
redis (~> 3.0, >= 3.0.4) redis (~> 3.0, >= 3.0.4)
@ -670,7 +671,7 @@ GEM
rspec-mocks (~> 3.3.0) rspec-mocks (~> 3.3.0)
rspec-support (~> 3.3.0) rspec-support (~> 3.3.0)
rspec-support (3.3.0) rspec-support (3.3.0)
rubocop (0.34.1) rubocop (0.34.2)
astrolabe (~> 1.3) astrolabe (~> 1.3)
parser (>= 2.2.2.5, < 3.0) parser (>= 2.2.2.5, < 3.0)
powerpack (~> 0.1) powerpack (~> 0.1)
@ -681,7 +682,7 @@ GEM
rubyzip (1.1.7) rubyzip (1.1.7)
rugged (0.23.2) rugged (0.23.2)
safe_yaml (1.0.4) safe_yaml (1.0.4)
sass (3.4.18) sass (3.4.19)
sass-rails (5.0.4) sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
sass (~> 3.1) sass (~> 3.1)
@ -700,8 +701,8 @@ GEM
rubyzip (~> 1.0) rubyzip (~> 1.0)
websocket (~> 1.0) websocket (~> 1.0)
shellany (0.0.1) shellany (0.0.1)
shoulda-matchers (2.8.0) shoulda-matchers (3.0.0)
activesupport (>= 3.0.0) activesupport (>= 4.0.0)
sidekiq (3.4.2) sidekiq (3.4.2)
celluloid (~> 0.16.0) celluloid (~> 0.16.0)
connection_pool (~> 2.2, >= 2.2.0) connection_pool (~> 2.2, >= 2.2.0)
@ -783,12 +784,13 @@ GEM
raindrops (~> 0.7) raindrops (~> 0.7)
uuid (2.3.8) uuid (2.3.8)
macaddr (~> 1.0) macaddr (~> 1.0)
valid (1.0.2) valid (1.1.0)
warden (1.2.3) warden (1.2.3)
rack (>= 1.0) rack (>= 1.0)
webmock (1.21.0) webmock (1.22.1)
addressable (>= 2.3.6) addressable (>= 2.3.6)
crack (>= 0.3.2) crack (>= 0.3.2)
hashdiff
websocket (1.2.2) websocket (1.2.2)
will_paginate (3.0.7) will_paginate (3.0.7)
xpath (2.0.0) xpath (2.0.0)
@ -813,7 +815,7 @@ DEPENDENCIES
compass-rails (= 2.0.5) compass-rails (= 2.0.5)
configurate (= 0.3.1) configurate (= 0.3.1)
cucumber-rails (= 1.4.2) cucumber-rails (= 1.4.2)
database_cleaner (= 1.5.0) database_cleaner (= 1.5.1)
devise (= 3.5.2) devise (= 3.5.2)
devise-token_authenticatable (~> 0.4.0) devise-token_authenticatable (~> 0.4.0)
devise_lastseenable (= 0.0.6) devise_lastseenable (= 0.0.6)
@ -822,7 +824,7 @@ DEPENDENCIES
entypo-rails (= 3.0.0.pre.rc2) entypo-rails (= 3.0.0.pre.rc2)
eye (= 0.7) eye (= 0.7)
factory_girl_rails (= 4.5.0) factory_girl_rails (= 4.5.0)
faraday (= 0.9.1) faraday (= 0.9.2)
faraday-cookie_jar (= 0.0.6) faraday-cookie_jar (= 0.0.6)
faraday_middleware (= 0.10.0) faraday_middleware (= 0.10.0)
fixture_builder (= 0.4.1) fixture_builder (= 0.4.1)
@ -836,7 +838,7 @@ DEPENDENCIES
guard-rubocop (= 1.2.0) guard-rubocop (= 1.2.0)
haml (= 4.0.7) haml (= 4.0.7)
haml_lint (= 0.15.2) haml_lint (= 0.15.2)
handlebars_assets (= 0.20.2) handlebars_assets (= 0.21.0)
http_accept_language (= 2.0.5) http_accept_language (= 2.0.5)
i18n-inflector-rails (= 1.0.7) i18n-inflector-rails (= 1.0.7)
jasmine (= 2.3.1) jasmine (= 2.3.1)
@ -852,7 +854,7 @@ DEPENDENCIES
logging-rails (= 0.5.0) logging-rails (= 0.5.0)
markerb (= 1.1.0) markerb (= 1.1.0)
messagebus_ruby_api (= 1.0.3) messagebus_ruby_api (= 1.0.3)
mini_magick (= 4.3.3) mini_magick (= 4.3.6)
minitest minitest
mobile-fu (= 1.3.1) mobile-fu (= 1.3.1)
mysql2 (= 0.3.20) mysql2 (= 0.3.20)
@ -888,7 +890,7 @@ DEPENDENCIES
rails-assets-jasmine-ajax (= 3.2.0)! rails-assets-jasmine-ajax (= 3.2.0)!
rails-assets-jeresig--jquery.hotkeys (= 0.2.0)! rails-assets-jeresig--jquery.hotkeys (= 0.2.0)!
rails-assets-jquery (= 1.11.2)! rails-assets-jquery (= 1.11.2)!
rails-assets-jquery-placeholder (= 2.1.2)! rails-assets-jquery-placeholder (= 2.1.3)!
rails-assets-jquery-textchange (= 0.2.3)! rails-assets-jquery-textchange (= 0.2.3)!
rails-assets-markdown-it (= 5.0.0)! rails-assets-markdown-it (= 5.0.0)!
rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)! rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)!
@ -904,18 +906,18 @@ DEPENDENCIES
rails_admin (= 0.7.0) rails_admin (= 0.7.0)
rb-fsevent (= 0.9.6) rb-fsevent (= 0.9.6)
rb-inotify (= 0.9.5) rb-inotify (= 0.9.5)
redcarpet (= 3.3.2) redcarpet (= 3.3.3)
remotipart (= 1.2.1) remotipart (= 1.2.1)
responders (= 2.1.0) responders (= 2.1.0)
roxml (= 3.1.6) roxml (= 3.1.6)
rspec-instafail (= 0.4.0) rspec-instafail (= 0.4.0)
rspec-rails (= 3.3.3) rspec-rails (= 3.3.3)
rubocop (= 0.34.1) rubocop (= 0.34.2)
ruby-oembed (= 0.8.14) ruby-oembed (= 0.8.14)
rubyzip (= 1.1.7) rubyzip (= 1.1.7)
sass-rails (= 5.0.4) sass-rails (= 5.0.4)
selenium-webdriver (= 2.47.1) selenium-webdriver (= 2.47.1)
shoulda-matchers (= 2.8.0) shoulda-matchers (= 3.0.0)
sidekiq (= 3.4.2) sidekiq (= 3.4.2)
sidetiq (= 0.6.3) sidetiq (= 0.6.3)
simple_captcha2 (= 0.3.4) simple_captcha2 (= 0.3.4)
@ -933,7 +935,7 @@ DEPENDENCIES
uglifier (= 2.7.2) uglifier (= 2.7.2)
unicorn (= 4.9.0) unicorn (= 4.9.0)
uuid (= 2.3.8) uuid (= 2.3.8)
webmock (= 1.21.0) webmock (= 1.22.1)
will_paginate (= 3.0.7) will_paginate (= 3.0.7)
BUNDLED WITH BUNDLED WITH

7
spec/spec_helper.rb
View file

@ -106,3 +106,10 @@ RSpec.configure do |config|
config.include FactoryGirl::Syntax::Methods config.include FactoryGirl::Syntax::Methods
end end
Shoulda::Matchers.configure do |config|
config.integrate do |with|
with.test_framework :rspec
with.library :rails
end
end