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

Merge branch 'master' into polls

Browse Source
This commit is contained in:
Juanjo Bazán
2017-01-20 11:34:12 +01:00
parent d30c97c0c2 4957ea2bf1
commit bd6514d4a4
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/budgets/investments/_sidebar.html.erb
View File

@@ -3,7 +3,7 @@
<% if can?(:create, Budget::Investment.new(budget: @budget)) %> <% if can?(:create, Budget::Investment.new(budget: @budget)) %>
<% if current_user && current_user.level_two_or_three_verified? %> <% if current_user && current_user.level_two_or_three_verified? %>
<%= link_to t("budgets.investments.index.sidebar.create"), <%= link_to t("budgets.investments.index.sidebar.create"),
new_budget_investment_path, class: "button budget expanded" %> new_budget_investment_path(budget_id: @budget.id), class: "button budget expanded" %>
<% else %> <% else %>
<div class="callout warning"> <div class="callout warning">
<%= t("budgets.investments.index.sidebar.verified_only", <%= t("budgets.investments.index.sidebar.verified_only",

1
spec/rails_helper.rb
View File

@@ -26,6 +26,7 @@ end
Capybara.register_driver :poltergeist do |app| Capybara.register_driver :poltergeist do |app|
Capybara::Poltergeist::Driver.new(app, Capybara::Poltergeist::Driver.new(app,
timeout: 1.minute,
inspector: true, # allows remote debugging by executing page.driver.debug inspector: true, # allows remote debugging by executing page.driver.debug
phantomjs_logger: File.open(File::NULL, "w"), # don't print console.log calls in console phantomjs_logger: File.open(File::NULL, "w"), # don't print console.log calls in console
phantomjs_options: ['--load-images=no', '--disk-cache=false'], phantomjs_options: ['--load-images=no', '--disk-cache=false'],