Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update gems and fix specs #34

Merged
merged 2 commits into from
Mar 9, 2015
Merged

Update gems and fix specs #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a83bfb0
specs: DatabaseCleaner has been clearing out the `spatial_ref_sys` table
drewda Mar 9, 2015
a04f8f6
updating gems
drewda Mar 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ GEM
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.3.7)
airborne (0.1.14)
airborne (0.1.15)
activesupport (>= 3.0.0)
rack-test (~> 0.6, >= 0.6.2)
rest-client (~> 1.7, >= 1.7.3)
Expand Down Expand Up @@ -97,16 +97,16 @@ GEM
execjs
coffee-script-source (1.9.1)
columnize (0.9.0)
connection_pool (2.1.1)
database_cleaner (1.4.0)
connection_pool (2.1.2)
database_cleaner (1.4.1)
debug_inspector (0.0.2)
debugger-linecache (1.2.0)
diff-lcs (1.2.5)
docile (1.1.5)
enumerize (0.10.0)
enumerize (0.10.1)
activesupport (>= 3.2)
erubis (2.7.0)
execjs (2.3.0)
execjs (2.4.0)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.5.0)
Expand Down Expand Up @@ -140,12 +140,12 @@ GEM
mime-types (2.4.3)
mini_portile (0.6.2)
minitest (5.5.1)
multi_json (1.10.1)
multi_json (1.11.0)
netrc (0.10.3)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
oauth (0.4.7)
oj (2.11.5)
oj (2.12.0)
omniauth (1.2.2)
hashie (>= 1.2, < 4)
rack (~> 1.0)
Expand Down Expand Up @@ -186,7 +186,7 @@ GEM
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-erd (1.3.0)
rails-erd (1.3.1)
activerecord (>= 3.2)
activesupport (>= 3.2)
choice (~> 0.1.6)
Expand Down Expand Up @@ -274,7 +274,7 @@ GEM
multi_json (~> 1.0)
simplecov-html (~> 0.9.0)
simplecov-html (0.9.0)
slim (3.0.2)
slim (3.0.3)
temple (~> 0.7.3)
tilt (>= 1.3.3, < 2.1)
slop (3.6.0)
Expand Down
6 changes: 3 additions & 3 deletions spec/spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@
config.include FactoryGirl::Syntax::Methods

config.before(:suite) do
DatabaseCleaner.strategy = :truncation, { except: ['public.spatial_ref_sys'] }
DatabaseCleaner.strategy = :truncation, { except: ['spatial_ref_sys'] }
begin
DatabaseCleaner.start
FactoryGirl.lint
ensure
DatabaseCleaner.clean_with :truncation, { except: ['public.spatial_ref_sys'] }
DatabaseCleaner.clean_with :truncation, { except: ['spatial_ref_sys'] }
end
end

config.before(:each) do
# TODO: sign out current user
DatabaseCleaner.clean_with :truncation, { except: ['public.spatial_ref_sys'] }
DatabaseCleaner.clean_with :truncation, { except: ['spatial_ref_sys'] }
end

config.before(:each, type: :feature) do
Expand Down