Merge pull request #48 from finnlabs/fix/whitespace-cleanup

Cleanup whitespace
pull/6827/head
meeee 10 years ago
commit 915dfdf87a
  1. 1
      app/models/cost_query.rb
  2. 1
      app/models/cost_query/filter.rb
  3. 2
      app/models/cost_query/group_by/singleton_value.rb
  4. 1
      app/models/cost_query/query_utils.rb
  5. 1
      app/models/cost_query/sql_statement.rb
  6. 1
      app/views/cost_reports/_report_category.html.erb
  7. 1
      db/migrate/20110215143061_aggregated_reporting_migrations.rb
  8. 2
      features/step_definitions/disabled_scenarios.rb
  9. 2
      spec/controllers/custom_fields_controller_spec.rb
  10. 1
      spec/models/cost_query/filter_spec.rb
  11. 2
      spec/models/cost_query/validation_spec.rb
  12. 2
      spec/support/project_helper.rb

@ -47,4 +47,3 @@ class CostQuery < Report
end
end
end

@ -46,4 +46,3 @@ class CostQuery::Filter < Report::Filter
]
end
end

@ -19,4 +19,4 @@
class CostQuery::GroupBy::SingletonValue < Report::GroupBy::SingletonValue
dont_display!
end
end

@ -50,4 +50,3 @@ module CostQuery::QueryUtils
propagate!
end

@ -117,4 +117,3 @@ class CostQuery::SqlStatement < Report::SqlStatement
sql
end
end

@ -27,4 +27,3 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<h3><%= l(:"label_#{report_type}_report_plural") %></h3>
<%= render :partial => "report_list", :locals => { :report_type => report_type, :queries => queries } %>
<% end -%>

@ -54,4 +54,3 @@ class AggregatedReportingMigrations < ActiveRecord::Migration
remove_timestamps :custom_fields
end
end

@ -18,4 +18,4 @@
#++
ScenarioDisabler.disable(:feature => "Tracking Time", :scenario => "Adding a time entry")
ScenarioDisabler.disable(:feature => "Tracking Time", :scenario => "Editing a time entry")
ScenarioDisabler.disable(:feature => "Tracking Time", :scenario => "Editing a time entry")

@ -130,7 +130,7 @@ describe CustomFieldsController do
}
}
before { session[engine_name] = query }
describe 'does not contain custom field reference' do
include_context 'remove custom field'

@ -433,4 +433,3 @@ describe CostQuery, :type => :model, :reporting_query_helper => true do
end
end
end

@ -74,4 +74,4 @@ describe CostQuery::Validation, :type => :model do
expect(obj.errors[:date].size).to eq(1)
end
end
end

@ -25,4 +25,4 @@ class Project
:name => "Project#{Project.all.size}"})
generate! options
end
end
end

Loading…
Cancel
Save