Merge branch 'feature/rails3' into feature/rails3_restructure_translations

pull/115/head
Philipp Tessenow 12 years ago
commit 6832d84925
  1. 4
      Gemfile
  2. 34
      Gemfile.lock
  3. 3
      app/models/query.rb
  4. 5
      app/models/version.rb
  5. 137
      spec/spec_helper.rb

@ -69,8 +69,6 @@ group :test do
gem "cucumber-rails-training-wheels" # http://aslakhellesoy.com/post/11055981222/the-training-wheels-came-off
gem "rspec-rails", "~> 2.0", :group => :development
gem 'capybara'
gem 'spork-rails'
gem 'spork-testunit' # needed for test-unit only
gem 'selenium-webdriver'
gem 'rb-readline' # ruby on CI needs this
@ -89,9 +87,9 @@ group :development do
gem 'rails-dev-tweaks', '~> 0.6.1'
gem 'guard-rspec'
gem 'guard-cucumber'
gem 'guard-spork'
gem 'rb-fsevent', :group => :test
gem 'rack-mini-profiler'
gem 'thin'
end
group :development, :test do

@ -123,6 +123,7 @@ GEM
rails (~> 3.0)
cucumber-rails-training-wheels (1.0.0)
cucumber-rails (>= 1.1.1)
daemons (1.1.9)
dalli (2.6.2)
database_cleaner (0.9.1)
debug_inspector (0.0.2)
@ -139,6 +140,7 @@ GEM
delayed_job (~> 3.0)
diff-lcs (1.2.4)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (1.4.0)
multi_json (~> 1.0)
factory_girl (4.2.0)
@ -160,13 +162,9 @@ GEM
guard-cucumber (1.4.0)
cucumber (>= 1.2.0)
guard (>= 1.1.0)
guard-rspec (2.6.0)
guard (>= 1.8)
rspec (~> 2.13)
guard-spork (1.5.0)
childprocess (>= 0.2.3)
guard-rspec (2.5.4)
guard (>= 1.1)
spork (>= 0.8.4)
rspec (~> 2.11)
guard-test (0.8.0)
guard (>= 1.1)
test-unit (~> 2.2)
@ -203,7 +201,7 @@ GEM
mime-types (1.23)
mocha (0.13.3)
metaclass (~> 0.0.1)
multi_json (1.7.3)
multi_json (1.7.2)
mysql (2.9.1)
mysql2 (0.3.11)
nokogiri (1.5.9)
@ -249,8 +247,8 @@ GEM
railties (~> 3.1)
rails-footnotes (3.7.9)
rails (>= 3.0.0)
rails_autolink (1.1.0)
rails (> 3.1)
rails_autolink (1.0.9)
rails (~> 3.1)
rake (10.0.4)
rb-fsevent (0.9.3)
rb-inotify (0.9.0)
@ -301,12 +299,6 @@ GEM
activesupport (>= 3.0.0)
bourne (~> 1.3)
slop (3.4.4)
spork (1.0.0rc3)
spork-rails (3.2.1)
rails (>= 3.0.0, < 3.3.0)
spork (>= 1.0rc0)
spork-testunit (0.0.8)
spork (>= 0.6.0)
sqlite3 (1.3.7)
sqlite3-ruby (1.2.5)
strong_parameters (0.2.0)
@ -318,9 +310,13 @@ GEM
therubyracer (0.11.4)
libv8 (~> 3.11.8.12)
ref
thin (1.5.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.18.1)
tilt (1.4.0)
tinymce-rails (3.5.8.2)
tilt (1.3.7)
tinymce-rails (3.5.8.1)
railties (>= 3.1.1)
tinymce-rails-langs (0.1)
tinymce-rails (>= 3.4.9)
@ -360,7 +356,6 @@ DEPENDENCIES
globalize3!
guard-cucumber
guard-rspec
guard-spork
guard-test
htmldiff
i18n-js!
@ -398,13 +393,12 @@ DEPENDENCIES
sass-rails (~> 3.2.3)
selenium-webdriver
shoulda (~> 3.1.1)
spork-rails
spork-testunit
sprockets!
sqlite3
sqlite3-ruby (< 1.3)
strong_parameters
therubyracer
thin
tinymce-rails
tinymce-rails-langs
uglifier (>= 1.0.3)

@ -601,7 +601,8 @@ class Query < ActiveRecord::Base
end
def add_custom_fields_filters(custom_fields)
@available_filters ||= {}
available_filters # compute default available_filters
return available_filters if available_filters.any? { |key, _| key.starts_with? 'cf_' }
custom_fields.select(&:is_filter?).each do |field|
case field.field_format

@ -59,7 +59,10 @@ class Version < ActiveRecord::Base
# Can either be a set date stored in the database or a dynamic one
# based on the earlist start_date of the fixed_issues
def start_date
read_attribute(:start_date) || fixed_issues.minimum('start_date')
# when self.id is nil (e.g. when self is a new_record),
# minimum('start_date') works on all issues with :fixed_version => nil
# but we expect only issues belonging to this version
read_attribute(:start_date) || fixed_issues.where(Issue.arel_table[:fixed_version_id].not_eq(nil)).minimum('start_date')
end
def due_date

@ -1,96 +1,53 @@
# --- Instructions ---
# Sort the contents of this file into a Spork.prefork and a Spork.each_run
# block.
#
# The Spork.prefork block is run only once when the spork server is started.
# You typically want to place most of your (slow) initializer code in here, in
# particular, require'ing any 3rd-party gems that you don't normally modify
# during development.
#
# The Spork.each_run block is run each time you run your specs. In case you
# need to load files that tend to change during development, require them here.
# With Rails, your application modules are loaded automatically, so sometimes
# this block can remain empty.
#
# Note: You can modify files loaded *from* the Spork.each_run block without
# restarting the spork server. However, this file itself will not be reloaded,
# so if you change any of the code inside the each_run block, you still need to
# restart the server. In general, if you have non-trivial code in this file,
# it's advisable to move it into a separate file so you can easily edit it
# without restarting spork. (For example, with RSpec, you could move
# non-trivial code into a file spec/support/my_helper.rb, making sure that the
# spec/support/* files are require'd from inside the each_run block.)
#
# Any code that is left outside the two blocks will be run during preforking
# *and* during each_run -- that's probably not what you want.
#
# These instructions should self-destruct in 10 seconds. If they don't, feel
# free to delete them.
require 'rubygems'
require 'spork'
#uncomment the following line to use spork with the debugger
#require 'spork/ext/ruby-debug'
Spork.prefork do
# Loading more in this block will cause your tests to run faster. However,
# if you change any configuration or code from libraries loaded here, you'll
# need to restart spork for it take effect.
# This file is copied to spec/ when you run 'rails generate rspec:install'
ENV["RAILS_ENV"] ||= 'test'
require File.expand_path("../../config/environment", __FILE__)
require 'rspec/rails'
require 'rspec/autorun'
require 'capybara/rails'
# Requires supporting ruby files with custom matchers and macros, etc,
# in spec/support/ and its subdirectories.
Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
RSpec.configure do |config|
# ## Mock Framework
#
# If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
#
# config.mock_with :mocha
# config.mock_with :flexmock
# config.mock_with :rr
config.mock_with :rspec
# Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
config.fixture_path = "#{::Rails.root}/spec/fixtures"
# If you're not using ActiveRecord, or you'd prefer not to run each of your
# examples within a transaction, remove the following line or assign false
# instead of true.
config.use_transactional_fixtures = true
# If true, the base class of anonymous controllers will be inferred
# automatically. This will be the default behavior in future versions of
# rspec-rails.
config.infer_base_class_for_anonymous_controllers = false
# Run specs in random order to surface order dependencies. If you find an
# order dependency and want to debug it, you can fix the order by providing
# the seed, which is printed after each run.
# --seed 1234
config.order = "random"
config.treat_symbols_as_metadata_keys_with_true_values = true
config.run_all_when_everything_filtered = true
config.after(:suite) do
[User, Project, Issue].each do |cls|
raise "your specs leave a #{cls} in the DB\ndid you use before(:all) instead of before or forget to kill the instances in a after(:all)?" if cls.count > 0
# This file is copied to spec/ when you run 'rails generate rspec:install'
ENV["RAILS_ENV"] ||= 'test'
require File.expand_path("../../config/environment", __FILE__)
require 'rspec/rails'
require 'rspec/autorun'
require 'capybara/rails'
# Requires supporting ruby files with custom matchers and macros, etc,
# in spec/support/ and its subdirectories.
Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
RSpec.configure do |config|
# ## Mock Framework
#
# If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
#
# config.mock_with :mocha
# config.mock_with :flexmock
# config.mock_with :rr
config.mock_with :rspec
# Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
config.fixture_path = "#{::Rails.root}/spec/fixtures"
# If you're not using ActiveRecord, or you'd prefer not to run each of your
# examples within a transaction, remove the following line or assign false
# instead of true.
config.use_transactional_fixtures = true
# If true, the base class of anonymous controllers will be inferred
# automatically. This will be the default behavior in future versions of
# rspec-rails.
config.infer_base_class_for_anonymous_controllers = false
# Run specs in random order to surface order dependencies. If you find an
# order dependency and want to debug it, you can fix the order by providing
# the seed, which is printed after each run.
# --seed 1234
config.order = "random"
config.treat_symbols_as_metadata_keys_with_true_values = true
config.run_all_when_everything_filtered = true
config.after(:suite) do
[User, Project, Issue].each do |cls|
raise "your specs leave a #{cls} in the DB\ndid you use before(:all) instead of before or forget to kill the instances in a after(:all)?" if cls.count > 0
end
end
end
end
Spork.each_run do
# This code will be run each time you run your specs.
FactoryGirl.reload
end

Loading…
Cancel
Save