consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1251 from consul/dependencies

Browse Source 
Dependencies
This commit is contained in:
Juanjo Bazán
2016-10-28 12:38:04 +02:00
committed by GitHub
parent 94238ac350 29905b61b7
commit de2df08665
3 changed files with 68 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Gemfile
View File

@@ -3,24 +3,24 @@ source 'https://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.7.1'
# Use PostgreSQL
gem 'pg'
gem 'pg', '~> 0.19.0'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0', '>= 5.0.4'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
gem 'uglifier', '>= 3.0.3'
# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.2.1'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby
# Use jquery as the JavaScript library
gem 'jquery-rails'
gem 'jquery-rails', '~> 4.2.1'
gem 'jquery-ui-rails'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks'
# Fix sprockets on the
gem 'sprockets', '~> 3.6.3'
gem 'sprockets', '~> 3.7.0'
gem 'devise', '~> 3.5.7'
gem 'devise_security_extension'
@@ -32,11 +32,11 @@ gem 'omniauth-facebook', '~> 3.0.0'
gem 'omniauth-google-oauth2', '~> 0.4.0'
gem 'kaminari'
gem 'ancestry'
gem 'ancestry', '~> 2.2.1'
gem 'acts-as-taggable-on'
gem 'responders'
gem 'foundation-rails'
gem 'foundation_rails_helper'
gem 'responders', '~> 2.3.0'
gem 'foundation-rails', '~> 6.2.4.0'
gem 'foundation_rails_helper', '~> 2.0.0'
gem 'acts_as_votable'
gem 'ckeditor', '~> 4.2.0'
gem 'invisible_captcha', '~> 0.9.1'
@@ -44,24 +44,24 @@ gem 'cancancan'
gem 'social-share-button'
gem 'initialjs-rails', '0.2.0.4'
gem 'unicorn', '~> 5.1.0'
gem 'paranoia'
gem 'rinku', require: 'rails_rinku'
gem 'paranoia', '~> 2.2.0'
gem 'rinku', '~> 2.0.2', require: 'rails_rinku'
gem 'savon'
gem 'dalli'
gem 'rollbar', '~> 2.12.0'
gem 'rollbar', '~> 2.13.3'
gem 'delayed_job_active_record', '~> 4.1.0'
gem 'daemons'
gem 'devise-async'
gem 'newrelic_rpm', '~> 3.16'
gem 'newrelic_rpm', '~> 3.17.0.325'
gem 'whenever', require: false
gem 'pg_search'
gem 'ahoy_matey', '~> 1.4.0'
gem 'groupdate' # group temporary data
gem 'tolk' # Web interface for translations
gem 'ahoy_matey', '~> 1.4.2'
gem 'groupdate', '~> 3.1.0' # group temporary data
gem 'tolk', '~> 2.0.0' # Web interface for translations
gem 'browser'
gem 'turnout'
gem 'turnout', '~> 2.4.0'
gem 'redcarpet'
group :development, :test do

81
Gemfile.lock
View File

@@ -56,7 +56,7 @@ GEM
akami (1.3.1)
gyoku (>= 0.4.0)
nokogiri
ancestry (2.1.0)
ancestry (2.2.1)
activerecord (>= 3.0.0)
arel (6.0.3)
ast (2.2.0)
@@ -163,11 +163,11 @@ GEM
i18n (~> 0.5)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
foundation-rails (6.2.3.0)
foundation-rails (6.2.4.0)
railties (>= 3.1.0)
sass (>= 3.3.0, < 3.5)
sprockets-es6 (>= 0.9.0)
foundation_rails_helper (1.2.1)
foundation_rails_helper (2.0.0)
actionpack (>= 4.1)
activemodel (>= 4.1)
activesupport (>= 4.1)
@@ -176,10 +176,10 @@ GEM
fuubar (2.1.1)
rspec (~> 3.0)
ruby-progressbar (~> 1.4)
geocoder (1.3.7)
geocoder (1.4.0)
globalid (0.3.7)
activesupport (>= 4.1.0)
groupdate (3.0.2)
groupdate (3.1.1)
activesupport (>= 3)
gyoku (1.3.1)
builder (>= 2.1.2)
@@ -203,7 +203,7 @@ GEM
railties (>= 3.1, < 6.0)
invisible_captcha (0.9.1)
rails
jquery-rails (4.1.1)
jquery-rails (4.2.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
@@ -238,10 +238,9 @@ GEM
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (3.2.0)
newrelic_rpm (3.16.3.323)
nokogiri (1.6.8)
newrelic_rpm (3.17.0.325)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
nori (2.6.0)
oauth (0.5.0)
oauth2 (1.0.0)
@@ -270,16 +269,15 @@ GEM
json (~> 1.3)
omniauth-oauth (~> 1.1)
orm_adapter (0.5.0)
paranoia (2.1.5)
activerecord (~> 4.0)
paranoia (2.2.0)
activerecord (>= 4.0, < 5.1)
parser (2.3.0.6)
ast (~> 2.2)
pg (0.18.4)
pg (0.19.0)
pg_search (1.0.6)
activerecord (>= 3.1)
activesupport (>= 3.1)
arel
pkg-config (1.1.7)
poltergeist (1.10.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
@@ -289,7 +287,7 @@ GEM
rack (1.6.4)
rack-accept (0.4.5)
rack (>= 0.4)
rack-attack (4.4.1)
rack-attack (5.0.1)
rack
rack-test (0.6.3)
rack (>= 1.0)
@@ -322,10 +320,10 @@ GEM
redcarpet (3.3.4)
referer-parser (0.3.0)
request_store (1.3.1)
responders (2.2.0)
responders (2.3.0)
railties (>= 4.2.0, < 5.1)
rinku (2.0.0)
rollbar (2.12.0)
rinku (2.0.2)
rollbar (2.13.3)
multi_json
rspec (3.5.0)
rspec-core (~> 3.5.0)
@@ -378,14 +376,14 @@ GEM
spring (1.7.2)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
sprockets (3.6.3)
sprockets (3.7.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-es6 (0.9.0)
sprockets-es6 (0.9.2)
babel-source (>= 5.8.11)
babel-transpiler
sprockets (>= 3.0.0)
sprockets-rails (3.1.1)
sprockets-rails (3.2.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
@@ -400,18 +398,19 @@ GEM
thread_safe (0.3.5)
tilt (2.0.5)
tins (1.11.0)
tolk (1.9.3)
rails (>= 4.0, < 4.3)
tolk (2.0.0)
rails (>= 4.0)
safe_yaml (>= 0.8.6)
turbolinks (2.5.3)
coffee-rails
turnout (2.3.1)
rack (~> 1.3)
turnout (2.4.0)
i18n (~> 0.7)
rack (>= 1.3, < 3)
rack-accept (~> 0.4)
tilt (>= 1.4, < 3)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (3.0.2)
uglifier (3.0.3)
execjs (>= 0.3.0, < 3)
unicorn (5.1.0)
kgio (~> 2.6)
@@ -442,8 +441,8 @@ PLATFORMS
DEPENDENCIES
acts-as-taggable-on
acts_as_votable
ahoy_matey (~> 1.4.0)
ancestry
ahoy_matey (~> 1.4.2)
ancestry (~> 2.2.1)
browser
bullet
byebug
@@ -467,44 +466,44 @@ DEPENDENCIES
email_spec
factory_girl_rails
faker
foundation-rails
foundation_rails_helper
foundation-rails (~> 6.2.4.0)
foundation_rails_helper (~> 2.0.0)
fuubar
groupdate
groupdate (~> 3.1.0)
i18n-tasks
initialjs-rails (= 0.2.0.4)
invisible_captcha (~> 0.9.1)
jquery-rails
jquery-rails (~> 4.2.1)
jquery-ui-rails
kaminari
launchy
letter_opener_web (~> 1.3.0)
newrelic_rpm (~> 3.16)
newrelic_rpm (~> 3.17.0.325)
omniauth
omniauth-facebook (~> 3.0.0)
omniauth-google-oauth2 (~> 0.4.0)
omniauth-twitter
paranoia
pg
paranoia (~> 2.2.0)
pg (~> 0.19.0)
pg_search
poltergeist
quiet_assets
rails (= 4.2.7.1)
redcarpet
responders
rinku
rollbar (~> 2.12.0)
responders (~> 2.3.0)
rinku (~> 2.0.2)
rollbar (~> 2.13.3)
rspec-rails (~> 3.5)
sass-rails (~> 5.0, >= 5.0.4)
savon
social-share-button
spring
spring-commands-rspec
sprockets (~> 3.6.3)
tolk
sprockets (~> 3.7.0)
tolk (~> 2.0.0)
turbolinks
turnout
uglifier (>= 1.3.0)
turnout (~> 2.4.0)
uglifier (>= 3.0.3)
unicorn (~> 5.1.0)
web-console (= 3.3.0)
whenever

28
spec/models/proposal_spec.rb
View File

@@ -793,54 +793,50 @@ describe Proposal do
end
describe "retired" do
before(:all) do
@proposal1 = create(:proposal)
@proposal2 = create(:proposal, retired_at: Time.now)
end
let!(:proposal1) { create(:proposal) }
let!(:proposal2) { create(:proposal, retired_at: Time.now) }
it "retired? is true" do
expect(@proposal1.retired?).to eq false
expect(@proposal2.retired?).to eq true
expect(proposal1.retired?).to eq false
expect(proposal2.retired?).to eq true
end
it "scope retired" do
retired = Proposal.retired
expect(retired.size).to eq(1)
expect(retired.first).to eq(@proposal2)
expect(retired.first).to eq(proposal2)
end
it "scope not_retired" do
not_retired = Proposal.not_retired
expect(not_retired.size).to eq(1)
expect(not_retired.first).to eq(@proposal1)
expect(not_retired.first).to eq(proposal1)
end
end
describe "archived" do
before(:each) do
@new_proposal = create(:proposal)
@archived_proposal = create(:proposal, :archived)
end
let!(:new_proposal) { create(:proposal) }
let!(:archived_proposal) { create(:proposal, :archived) }
it "archived? is true only for proposals created more than n (configured months) ago" do
expect(@new_proposal.archived?).to eq false
expect(@archived_proposal.archived?).to eq true
expect(new_proposal.archived?).to eq false
expect(archived_proposal.archived?).to eq true
end
it "scope archived" do
archived = Proposal.archived
expect(archived.size).to eq(1)
expect(archived.first).to eq(@archived_proposal)
expect(archived.first).to eq(archived_proposal)
end
it "scope archived" do
not_archived = Proposal.not_archived
expect(not_archived.size).to eq(1)
expect(not_archived.first).to eq(@new_proposal)
expect(not_archived.first).to eq(new_proposal)
end
end