diff --git a/Gemfile b/Gemfile index e925fb642..628f8c10d 100644 --- a/Gemfile +++ b/Gemfile @@ -74,7 +74,7 @@ group :development, :test do gem 'quiet_assets' gem 'letter_opener_web', '~> 1.3.0' gem 'i18n-tasks' - gem 'capistrano', '3.4.0', require: false + gem 'capistrano', '3.4.1', require: false gem "capistrano-bundler", '1.1.4', require: false gem "capistrano-rails", '1.1.6', require: false gem "capistrano-rvm", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 755561fb2..6d41a3669 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -76,9 +76,9 @@ GEM bullet (5.0.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.9.0) - byebug (8.2.2) + byebug (8.2.4) cancancan (1.13.1) - capistrano (3.4.0) + capistrano (3.4.1) i18n rake (>= 10.0.0) sshkit (~> 1.3) @@ -91,9 +91,9 @@ GEM capistrano-rvm (0.1.2) capistrano (~> 3.0) sshkit (~> 1.2) - capistrano3-delayed-job (1.6.0) + capistrano3-delayed-job (1.7.0) capistrano (>= 3.0.0) - capybara (2.6.2) + capybara (2.7.0) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -125,7 +125,7 @@ GEM tins (~> 1.6.0) daemons (1.2.3) dalli (2.7.6) - database_cleaner (1.5.1) + database_cleaner (1.5.2) debug_inspector (0.0.2) delayed_job (4.1.1) activesupport (>= 3.0, < 5.0) @@ -154,16 +154,16 @@ GEM errbase (0.0.3) erubis (2.7.0) execjs (2.6.0) - factory_girl (4.5.0) + factory_girl (4.7.0) activesupport (>= 3.0.0) - factory_girl_rails (4.6.0) - factory_girl (~> 4.5.0) + factory_girl_rails (4.7.0) + factory_girl (~> 4.7.0) railties (>= 3.0.0) faker (1.6.3) i18n (~> 0.5) faraday (0.9.2) multipart-post (>= 1.2, < 3) - foundation-rails (6.2.0.1) + foundation-rails (6.2.1.0) railties (>= 3.1.0) sass (>= 3.3.0, < 3.5) sprockets-es6 (>= 0.9.0) @@ -233,7 +233,7 @@ GEM multipart-post (2.0.0) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (3.0.2) + net-ssh (3.1.1) newrelic_rpm (3.15.1.316) nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) @@ -343,7 +343,7 @@ GEM rspec-support (3.4.1) ruby-progressbar (1.7.5) safe_yaml (1.0.4) - sass (3.4.21) + sass (3.4.22) sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) sass (~> 3.1) @@ -365,10 +365,10 @@ GEM json (~> 1.8) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) - spring (1.6.4) + spring (1.7.1) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (3.5.2) + sprockets (3.6.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-es6 (0.9.0) @@ -379,7 +379,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sshkit (1.8.1) + sshkit (1.9.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) term-ansicolor (1.3.2) @@ -438,7 +438,7 @@ DEPENDENCIES bullet byebug cancancan - capistrano (= 3.4.0) + capistrano (= 3.4.1) capistrano-bundler (= 1.1.4) capistrano-rails (= 1.1.6) capistrano-rvm diff --git a/app/views/admin/spending_proposals/show.html.erb b/app/views/admin/spending_proposals/show.html.erb index c54816071..64313e030 100644 --- a/app/views/admin/spending_proposals/show.html.erb +++ b/app/views/admin/spending_proposals/show.html.erb @@ -1,4 +1,4 @@ -<%= link_to admin_spending_proposals_path(SpendingProposal.filter_params(params)) do %> +<%= link_to admin_spending_proposals_path(SpendingProposal.filter_params(params)), data: {no_turbolink: true} do %> <%= t("admin.spending_proposals.show.back") %> <% end %> diff --git a/spec/features/admin/tags_spec.rb b/spec/features/admin/tags_spec.rb index 74579c1b8..b944cdd9e 100644 --- a/spec/features/admin/tags_spec.rb +++ b/spec/features/admin/tags_spec.rb @@ -33,7 +33,7 @@ feature 'Admin tags' do scenario 'Update' do visit admin_tags_path featured_checkbox = find("#tag_featured_#{@tag1.id}") - expect(featured_checkbox.checked?).to be_nil + expect(featured_checkbox.checked?).to be_blank within("#edit_tag_#{@tag1.id}") do check "tag_featured_#{@tag1.id}" @@ -42,7 +42,7 @@ feature 'Admin tags' do visit admin_tags_path featured_checkbox = find("#tag_featured_#{@tag1.id}") - expect(featured_checkbox.checked?).to eq('checked') + expect(featured_checkbox.checked?).to eq(true) end scenario 'Delete' do