Merge pull request #5812 from diaspora/update_gems

Update gems
This commit is contained in:
Jonne Haß 2015-03-25 13:29:51 +01:00
commit 3df3b89625
7 changed files with 92 additions and 81 deletions

View file

@ -21,6 +21,7 @@ branches:
- 'master'
- 'develop'
before_install: gem install bundler
bundler_args: "--without development production heroku --jobs 3 --retry 3"
script: "./script/ci/build.sh"

22
Gemfile
View file

@ -32,8 +32,8 @@ gem "simple_captcha2", "0.3.4", require: "simple_captcha"
# Background processing
gem "sidekiq", "3.3.2"
gem "sinatra", "1.4.5"
gem "sidekiq", "3.3.3"
gem "sinatra", "1.4.6"
# Scheduled processing
@ -56,7 +56,7 @@ gem "rack-cors", "0.3.1", require: "rack/cors"
gem "bootstrap-sass", "2.3.2.2"
gem "compass-rails", "2.0.4"
gem "sass-rails", "5.0.1"
gem "autoprefixer-rails", "5.1.7"
gem "autoprefixer-rails", "5.1.7.1"
# Database
@ -71,7 +71,7 @@ gem "activerecord-import", "0.7.0"
gem "carrierwave", "0.10.0"
gem "fog", "1.28.0"
gem "mini_magick", "4.1.0"
gem "mini_magick", "4.2.0"
gem "remotipart", "1.2.1"
# GUID generation
@ -149,7 +149,7 @@ gem "rails-assets-diaspora_jsxc", "~> 0.1.1", source: "https://rails-assets.org"
# Tags
gem "acts-as-taggable-on", "3.4.4"
gem "acts-as-taggable-on", "3.5.0"
# URIs and HTTP
@ -188,7 +188,7 @@ gem "minitest"
group :production do # we don"t install these on travis to speed up test runs
# Administration
gem "rails_admin", "0.6.6"
gem "rails_admin", "0.6.7"
# Analytics
@ -215,11 +215,11 @@ end
group :development do
# Automatic test runs
gem "guard-cucumber", "1.5.3"
gem "guard-cucumber", "1.5.4"
gem "guard-jshintrb", "1.1.1"
gem "guard-rspec", "4.5.0"
gem "guard-rubocop", "1.2.0"
gem "guard", "2.12.4", require: false
gem "guard", "2.12.5", require: false
gem "rb-fsevent", "0.9.4", require: false
gem "rb-inotify", "0.9.5", require: false
@ -245,7 +245,7 @@ group :test do
gem "fixture_builder", "0.3.6"
gem "fuubar", "2.0.0"
gem "rspec-instafail", "0.2.6", require: false
gem "test_after_commit", "0.4.0"
gem "test_after_commit", "0.4.1"
# Cucumber (integration tests)
@ -263,7 +263,7 @@ end
group :development, :test do
# RSpec (unit tests, some integration tests)
gem "rspec-rails", "3.1.0"
gem "rspec-rails", "3.2.1"
# Cucumber (integration tests)
gem "cucumber-rails", "1.4.2", require: false
@ -271,6 +271,6 @@ group :development, :test do
# Jasmine (client side application tests (JS))
gem "jasmine", "2.2.0"
gem "jasmine-jquery-rails", "2.0.3"
gem "rails-assets-jasmine-ajax", "3.0.0", source: "https://rails-assets.org"
gem "rails-assets-jasmine-ajax", "3.1.0", source: "https://rails-assets.org"
gem "sinon-rails", "1.10.3"
end

View file

@ -2,7 +2,7 @@ GEM
remote: https://rubygems.org/
remote: https://rails-assets.org/
specs:
CFPropertyList (2.3.0)
CFPropertyList (2.3.1)
actionmailer (4.2.1)
actionpack (= 4.2.1)
actionview (= 4.2.1)
@ -50,7 +50,7 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
acts-as-taggable-on (3.4.4)
acts-as-taggable-on (3.5.0)
activerecord (>= 3.2, < 5)
acts_as_api (0.4.2)
activemodel (>= 3.0.0)
@ -65,7 +65,7 @@ GEM
ast (2.0.0)
astrolabe (1.3.0)
parser (>= 2.2.0.pre.3, < 3.0)
autoprefixer-rails (5.1.7)
autoprefixer-rails (5.1.7.1)
execjs
json
backbone-on-rails (1.1.2.0)
@ -81,10 +81,8 @@ GEM
bootstrap-sass (2.3.2.2)
sass (~> 3.2)
builder (3.2.2)
byebug (3.5.1)
columnize (~> 0.8)
debugger-linecache (~> 1.2)
slop (~> 3.6)
byebug (4.0.3)
columnize (= 0.9.0)
capybara (2.4.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
@ -127,7 +125,7 @@ GEM
sass-rails (<= 5.0.1)
sprockets (< 2.13)
configurate (0.2.0)
connection_pool (2.1.1)
connection_pool (2.1.3)
crack (0.4.2)
safe_yaml (~> 1.0.0)
cucumber (1.3.19)
@ -143,7 +141,6 @@ GEM
nokogiri (~> 1.5)
rails (>= 3, < 5)
database_rewinder (0.5.1)
debugger-linecache (1.2.0)
devise (3.4.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
@ -185,8 +182,8 @@ GEM
ethon (0.7.3)
ffi (>= 1.3.0)
eventmachine (1.0.7)
excon (0.44.3)
execjs (2.3.0)
excon (0.44.4)
execjs (2.4.0)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.5.0)
@ -199,7 +196,7 @@ GEM
http-cookie (~> 1.0.0)
faraday_middleware (0.9.1)
faraday (>= 0.7.4, < 0.10)
ffi (1.9.6)
ffi (1.9.8)
fission (0.5.0)
CFPropertyList (~> 2.2)
fixture_builder (0.3.6)
@ -249,7 +246,7 @@ GEM
fog-xml
fog-json (1.0.0)
multi_json (~> 1.0)
fog-profitbricks (0.0.1)
fog-profitbricks (0.0.2)
fog-core
fog-xml
nokogiri
@ -302,7 +299,7 @@ GEM
json
multi_json
request_store (>= 1.0.5)
guard (2.12.4)
guard (2.12.5)
formatador (>= 0.2.4)
listen (~> 2.7)
lumberjack (~> 1.0)
@ -312,9 +309,8 @@ GEM
shellany (~> 0.0)
thor (>= 0.18.1)
guard-compat (1.2.1)
guard-cucumber (1.5.3)
guard-cucumber (1.5.4)
cucumber (>= 1.3.0)
guard (>= 2.0.0)
guard-compat (~> 1.0)
nenv (~> 0.1)
guard-jshintrb (1.1.1)
@ -374,12 +370,12 @@ GEM
multi_json (>= 1.3)
rake
json (1.8.2)
jwt (1.3.0)
jwt (1.4.1)
kaminari (0.16.3)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.9.3)
listen (2.8.5)
listen (2.9.0)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
@ -395,7 +391,7 @@ GEM
messagebus_ruby_api (1.0.3)
method_source (0.8.2)
mime-types (2.4.3)
mini_magick (4.1.0)
mini_magick (4.2.0)
mini_portile (0.6.2)
minitest (5.5.1)
mobile-fu (1.3.1)
@ -455,8 +451,8 @@ GEM
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-byebug (3.0.1)
byebug (~> 3.4)
pry-byebug (3.1.0)
byebug (~> 4.0)
pry (~> 0.10)
pry-debundle (0.8)
pry
@ -496,7 +492,7 @@ GEM
rails-assets-jquery-ui (~> 1.10.4)
rails-assets-jquery.slimscroll (~> 1.3.3)
rails-assets-jasmine (2.2.1)
rails-assets-jasmine-ajax (3.0.0)
rails-assets-jasmine-ajax (3.1.0)
rails-assets-jasmine (~> 2.0)
rails-assets-jeresig--jquery.hotkeys (0.2.0)
rails-assets-jquery (>= 1.4.2)
@ -539,7 +535,7 @@ GEM
rails-timeago (2.11.0)
actionpack (>= 3.1)
activesupport (>= 3.1)
rails_admin (0.6.6)
rails_admin (0.6.7)
builder (~> 3.1)
coffee-rails (~> 4.0)
font-awesome-rails (>= 3.0, < 5)
@ -575,28 +571,29 @@ GEM
roxml (3.1.6)
activesupport (>= 2.3.0)
nokogiri (>= 1.3.3)
rspec (3.1.0)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-core (3.1.7)
rspec-support (~> 3.1.0)
rspec-expectations (3.1.2)
rspec (3.2.0)
rspec-core (~> 3.2.0)
rspec-expectations (~> 3.2.0)
rspec-mocks (~> 3.2.0)
rspec-core (3.2.2)
rspec-support (~> 3.2.0)
rspec-expectations (3.2.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.1.0)
rspec-support (~> 3.2.0)
rspec-instafail (0.2.6)
rspec
rspec-mocks (3.1.3)
rspec-support (~> 3.1.0)
rspec-rails (3.1.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-support (~> 3.1.0)
rspec-support (3.1.2)
rspec-mocks (3.2.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.2.0)
rspec-rails (3.2.1)
actionpack (>= 3.0, < 4.3)
activesupport (>= 3.0, < 4.3)
railties (>= 3.0, < 4.3)
rspec-core (~> 3.2.0)
rspec-expectations (~> 3.2.0)
rspec-mocks (~> 3.2.0)
rspec-support (~> 3.2.0)
rspec-support (3.2.2)
rubocop (0.29.1)
astrolabe (~> 1.3)
parser (>= 2.2.0.1, < 3.0)
@ -604,7 +601,7 @@ GEM
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.4)
ruby-oembed (0.8.12)
ruby-progressbar (1.7.1)
ruby-progressbar (1.7.4)
rubyzip (1.1.7)
safe_yaml (1.0.4)
sass (3.4.13)
@ -622,7 +619,7 @@ GEM
shellany (0.0.1)
shoulda-matchers (2.8.0)
activesupport (>= 3.0.0)
sidekiq (3.3.2)
sidekiq (3.3.3)
celluloid (>= 0.16.0)
connection_pool (>= 2.1.1)
json
@ -635,10 +632,10 @@ GEM
simple_captcha2 (0.3.4)
rails (>= 4.1)
simple_oauth (0.2.0)
sinatra (1.4.5)
sinatra (1.4.6)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4)
tilt (>= 1.3, < 3)
sinon-rails (1.10.3)
railties (>= 3.1)
slop (3.6.0)
@ -656,8 +653,8 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
systemu (2.6.4)
test_after_commit (0.4.0)
systemu (2.6.5)
test_after_commit (0.4.1)
activerecord (>= 3.2)
thor (0.19.1)
thread_safe (0.3.5)
@ -707,11 +704,11 @@ DEPENDENCIES
actionpack-page_caching
active_model_serializers (= 0.9.3)
activerecord-import (= 0.7.0)
acts-as-taggable-on (= 3.4.4)
acts-as-taggable-on (= 3.5.0)
acts_as_api (= 0.4.2)
addressable (= 2.3.7)
asset_sync (= 1.1.0)
autoprefixer-rails (= 5.1.7)
autoprefixer-rails (= 5.1.7.1)
backbone-on-rails (= 1.1.2)
bootstrap-sass (= 2.3.2.2)
capybara (= 2.4.4)
@ -734,8 +731,8 @@ DEPENDENCIES
foreman (= 0.62)
fuubar (= 2.0.0)
gon (= 5.2.3)
guard (= 2.12.4)
guard-cucumber (= 1.5.3)
guard (= 2.12.5)
guard-cucumber (= 1.5.4)
guard-jshintrb (= 1.1.1)
guard-rspec (= 4.5.0)
guard-rubocop (= 1.2.0)
@ -752,7 +749,7 @@ DEPENDENCIES
json (= 1.8.2)
markerb (= 1.0.2)
messagebus_ruby_api (= 1.0.3)
mini_magick (= 4.1.0)
mini_magick (= 4.2.0)
minitest
mobile-fu (= 1.3.1)
mysql2 (= 0.3.18)
@ -774,7 +771,7 @@ DEPENDENCIES
rack-ssl (= 1.4.1)
rails (= 4.2.1)
rails-assets-diaspora_jsxc (~> 0.1.1)!
rails-assets-jasmine-ajax (= 3.0.0)!
rails-assets-jasmine-ajax (= 3.1.0)!
rails-assets-jeresig--jquery.hotkeys (= 0.2.0)!
rails-assets-jquery (= 1.11.1)!
rails-assets-jquery-idletimer (= 1.0.1)!
@ -791,7 +788,7 @@ DEPENDENCIES
rails-assets-punycode (= 1.3.2)!
rails-i18n (= 4.0.4)
rails-timeago (= 2.11.0)
rails_admin (= 0.6.6)
rails_admin (= 0.6.7)
rb-fsevent (= 0.9.4)
rb-inotify (= 0.9.5)
redcarpet (= 3.2.2)
@ -799,21 +796,21 @@ DEPENDENCIES
responders (= 2.1.0)
roxml (= 3.1.6)
rspec-instafail (= 0.2.6)
rspec-rails (= 3.1.0)
rspec-rails (= 3.2.1)
rubocop (= 0.29.1)
ruby-oembed (= 0.8.12)
sass-rails (= 5.0.1)
selenium-webdriver (= 2.45.0)
shoulda-matchers (= 2.8.0)
sidekiq (= 3.3.2)
sidekiq (= 3.3.3)
sidetiq (= 0.6.3)
simple_captcha2 (= 0.3.4)
sinatra (= 1.4.5)
sinatra (= 1.4.6)
sinon-rails (= 1.10.3)
spring (= 1.3.3)
spring-commands-cucumber (= 1.0.1)
spring-commands-rspec (= 1.0.4)
test_after_commit (= 0.4.0)
test_after_commit (= 0.4.1)
timecop (= 0.7.3)
twitter (= 4.8.1)
twitter-text (= 1.11.0)

View file

@ -13,7 +13,9 @@ require 'capybara/session'
#require 'cucumber/rails/capybara_javascript_emulation' # Lets you click links with onclick javascript handlers without using @culerity or @javascript
# Ensure we know the appservers port
Capybara.server_port = 9887
Capybara.server_port = AppConfig.pod_uri.port
Rails.application.routes.default_url_options[:host] = AppConfig.pod_uri.host
Rails.application.routes.default_url_options[:port] = AppConfig.pod_uri.port
# Use a version of Firefox defined by environment variable, if set
Capybara.register_driver :selenium do |app|

View file

@ -1,8 +1,6 @@
require 'spec_helper'
describe Reshare, :type => :model do
include Rails.application.routes.url_helpers
it 'has a valid Factory' do
expect(FactoryGirl.build(:reshare)).to be_valid
end
@ -207,7 +205,15 @@ describe Reshare, :type => :model do
allow(@response).to receive(:body).and_return(@root_object.to_diaspora_xml)
expect(Faraday.default_connection).to receive(:get).with(URI.join(@original_author.url, short_post_path(@root_object.guid, :format => "xml"))).and_return(@response)
expect(Faraday.default_connection).to receive(:get).with(
URI.join(
@original_author.url,
Rails.application.routes.url_helpers.short_post_path(
@root_object.guid,
format: "xml"
)
)
).and_return(@response)
Reshare.from_xml(@xml)
end
@ -235,7 +241,15 @@ describe Reshare, :type => :model do
context 'saving the post' do
before do
allow(@response).to receive(:body).and_return(@root_object.to_diaspora_xml)
allow(Faraday.default_connection).to receive(:get).with(URI.join(@reshare.root.author.url, short_post_path(@root_object.guid, :format => "xml"))).and_return(@response)
allow(Faraday.default_connection).to receive(:get).with(
URI.join(
@reshare.root.author.url,
Rails.application.routes.url_helpers.short_post_path(
@root_object.guid,
format: "xml"
)
)
).and_return(@response)
end
it 'fetches the root post from root_guid' do

View file

@ -20,6 +20,8 @@ end
ProcessedImage.enable_processing = false
UnprocessedImage.enable_processing = false
Rails.application.routes.default_url_options[:host] = AppConfig.pod_uri.host
Rails.application.routes.default_url_options[:port] = AppConfig.pod_uri.port
def set_up_friends
[local_luke, local_leia, remote_raphael]

View file

@ -1,9 +1,4 @@
class User
include Rails.application.routes.url_helpers
def default_url_options
{:host => AppConfig.pod_uri.host}
end
alias_method :share_with_original, :share_with
def share_with(*args)
@ -22,7 +17,7 @@ class User
self.aspects.reload
add_to_streams(p, aspects)
dispatch_opts = {:url => post_url(p), :to => opts[:to]}
dispatch_opts = {url: Rails.application.routes.url_helpers.post_url(p), to: opts[:to]}
dispatch_opts.merge!(:additional_subscribers => p.root.author) if class_name == :reshare
dispatch_post(p, dispatch_opts)
end