Download as
Browse Code »

Commit bbaa0fccfab36c6a58265e944f390bcd73b0f974

Authored by Dmitriy Zaporozhets
1 parent 5f7f35e8
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Update poltergeist and should-matchers

Showing 3 changed files with 14 additions and 24 deletions   Show diff stats
Gemfile
  Diff comments   View file @bbaa0fc
... ... @@ -171,14 +171,14 @@ group :development, :test do
171 171 gem 'rb-inotify', require: linux_only('rb-inotify')
172 172  
173 173 # PhantomJS driver for Capybara
174   - gem 'poltergeist', git: 'https://github.com/jonleighton/poltergeist.git', ref: '9645b52009e258921b860d3b7601d00008b22c45'
  174 + gem 'poltergeist', '~> 1.3.0'
175 175  
176 176 gem 'spork', '~> 1.0rc'
177 177 end
178 178  
179 179 group :test do
180 180 gem "simplecov", require: false
181   - gem "shoulda-matchers", "1.3.0"
  181 + gem "shoulda-matchers", "~> 2.1.0"
182 182 gem 'email_spec'
183 183 gem "webmock"
184 184 gem 'test_after_commit'
... ...
Gemfile.lock
  Diff comments   View file @bbaa0fc
... ... @@ -12,16 +12,6 @@ GIT
12 12 specs:
13 13 raphael-rails (2.1.0)
14 14  
15   -GIT
16   - remote: https://github.com/jonleighton/poltergeist.git
17   - revision: 9645b52009e258921b860d3b7601d00008b22c45
18   - ref: 9645b52009e258921b860d3b7601d00008b22c45
19   - specs:
20   - poltergeist (1.1.0)
21   - capybara (~> 2.0, >= 2.0.1)
22   - faye-websocket (~> 0.4, >= 0.4.4)
23   - http_parser.rb (~> 0.5.3)
24   -
25 15 GEM
26 16 remote: https://rubygems.org/
27 17 specs:
... ... @@ -103,7 +93,7 @@ GEM
103 93 thor
104 94 crack (0.3.2)
105 95 daemons (1.1.9)
106   - database_cleaner (0.9.1)
  96 + database_cleaner (1.0.1)
107 97 debug_inspector (0.0.2)
108 98 descendants_tracker (0.0.1)
109 99 devise (2.2.4)
... ... @@ -203,7 +193,7 @@ GEM
203 193 lumberjack (>= 1.0.2)
204 194 pry (>= 0.9.10)
205 195 thor (>= 0.14.6)
206   - guard-rspec (2.6.0)
  196 + guard-rspec (3.0.0)
207 197 guard (>= 1.8)
208 198 rspec (~> 2.13)
209 199 guard-spinach (0.0.2)
... ... @@ -246,7 +236,7 @@ GEM
246 236 letter_opener (1.1.0)
247 237 launchy (~> 2.2.0)
248 238 libv8 (3.11.8.17)
249   - listen (1.0.3)
  239 + listen (1.1.3)
250 240 rb-fsevent (>= 0.9.3)
251 241 rb-inotify (>= 0.9)
252 242 rb-kqueue (>= 0.2)
... ... @@ -293,9 +283,13 @@ GEM
293 283 omniauth-oauth (~> 1.0)
294 284 orm_adapter (0.4.0)
295 285 pg (0.15.1)
  286 + poltergeist (1.3.0)
  287 + capybara (~> 2.1.0)
  288 + faye-websocket (>= 0.4.4, < 0.5.0)
  289 + http_parser.rb (~> 0.5.3)
296 290 polyglot (0.3.3)
297 291 posix-spawn (0.3.6)
298   - pry (0.9.12.1)
  292 + pry (0.9.12.2)
299 293 coderay (~> 1.0.5)
300 294 method_source (~> 0.8)
301 295 slop (~> 3.4)
... ... @@ -414,7 +408,7 @@ GEM
414 408 thor (~> 0.14)
415 409 settingslogic (2.0.9)
416 410 sexp_processor (4.2.1)
417   - shoulda-matchers (1.3.0)
  411 + shoulda-matchers (2.1.0)
418 412 activesupport (>= 3.0.0)
419 413 sidekiq (2.12.0)
420 414 celluloid (>= 0.14.0)
... ... @@ -435,7 +429,7 @@ GEM
435 429 slim (1.3.8)
436 430 temple (~> 0.6.3)
437 431 tilt (~> 1.3.3)
438   - slop (3.4.4)
  432 + slop (3.4.5)
439 433 spinach (0.8.2)
440 434 colorize (= 0.5.8)
441 435 gherkin-ruby (~> 0.3.0)
... ... @@ -554,7 +548,7 @@ DEPENDENCIES
554 548 omniauth-google-oauth2
555 549 omniauth-twitter
556 550 pg
557   - poltergeist!
  551 + poltergeist (~> 1.3.0)
558 552 pry
559 553 puma (~> 2.0.1)
560 554 quiet_assets (~> 1.0.1)
... ... @@ -573,7 +567,7 @@ DEPENDENCIES
573 567 seed-fu
574 568 select2-rails
575 569 settingslogic
576   - shoulda-matchers (= 1.3.0)
  570 + shoulda-matchers (~> 2.1.0)
577 571 sidekiq
578 572 simplecov
579 573 sinatra
... ...
spec/models/project_spec.rb
  Diff comments   View file @bbaa0fc
... ... @@ -61,10 +61,6 @@ describe Project do
61 61 it { should ensure_length_of(:path).is_within(0..255) }
62 62 it { should ensure_length_of(:description).is_within(0..2000) }
63 63 it { should validate_presence_of(:creator) }
64   - it { should ensure_inclusion_of(:issues_enabled).in_array([true, false]) }
65   - it { should ensure_inclusion_of(:wall_enabled).in_array([true, false]) }
66   - it { should ensure_inclusion_of(:merge_requests_enabled).in_array([true, false]) }
67   - it { should ensure_inclusion_of(:wiki_enabled).in_array([true, false]) }
68 64 it { should ensure_length_of(:issues_tracker_id).is_within(0..255) }
69 65  
70 66 it "should not allow new projects beyond user limits" do
... ...