Commit cb1c815d authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #8688 from tsigo/rs-clean-spec-output

Minor spec output cleanup
parents 98116b76 ed17adfb
...@@ -254,7 +254,7 @@ end ...@@ -254,7 +254,7 @@ end
group :test do group :test do
gem "simplecov", require: false gem "simplecov", require: false
gem "shoulda-matchers", "~> 2.1.0" gem "shoulda-matchers", "~> 2.7.0"
gem 'email_spec' gem 'email_spec'
gem "webmock" gem "webmock"
gem 'test_after_commit' gem 'test_after_commit'
......
...@@ -260,7 +260,7 @@ GEM ...@@ -260,7 +260,7 @@ GEM
multi_xml (>= 0.5.2) multi_xml (>= 0.5.2)
httpauth (0.2.1) httpauth (0.2.1)
httpclient (2.5.3.3) httpclient (2.5.3.3)
i18n (0.6.11) i18n (0.7.0)
ice_nine (0.10.0) ice_nine (0.10.0)
jasmine (2.0.2) jasmine (2.0.2)
jasmine-core (~> 2.0.0) jasmine-core (~> 2.0.0)
...@@ -279,7 +279,7 @@ GEM ...@@ -279,7 +279,7 @@ GEM
turbolinks turbolinks
jquery-ui-rails (4.2.1) jquery-ui-rails (4.2.1)
railties (>= 3.2.16) railties (>= 3.2.16)
json (1.8.1) json (1.8.2)
jwt (0.1.13) jwt (0.1.13)
multi_json (>= 1.5) multi_json (>= 1.5)
kaminari (0.15.1) kaminari (0.15.1)
...@@ -495,7 +495,7 @@ GEM ...@@ -495,7 +495,7 @@ GEM
sass (~> 3.2) sass (~> 3.2)
settingslogic (2.0.9) settingslogic (2.0.9)
sexp_processor (4.4.0) sexp_processor (4.4.0)
shoulda-matchers (2.1.0) shoulda-matchers (2.7.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
sidekiq (3.3.0) sidekiq (3.3.0)
celluloid (>= 0.16.0) celluloid (>= 0.16.0)
...@@ -719,7 +719,7 @@ DEPENDENCIES ...@@ -719,7 +719,7 @@ DEPENDENCIES
select2-rails select2-rails
semantic-ui-sass (~> 1.8.0) semantic-ui-sass (~> 1.8.0)
settingslogic settingslogic
shoulda-matchers (~> 2.1.0) shoulda-matchers (~> 2.7.0)
sidekiq (~> 3.3) sidekiq (~> 3.3)
simplecov simplecov
sinatra sinatra
......
...@@ -161,8 +161,8 @@ describe Issue, 'Votes' do ...@@ -161,8 +161,8 @@ describe Issue, 'Votes' do
add_note '+1 I still like this' add_note '+1 I still like this'
add_note '+1 I really like this' add_note '+1 I really like this'
add_note '+1 Give me this now!!!!' add_note '+1 Give me this now!!!!'
p issue.downvotes.should == 0 issue.downvotes.should == 0
p issue.upvotes.should == 1 issue.upvotes.should == 1
end end
it 'should count a users vote only once without caring about comments' do it 'should count a users vote only once without caring about comments' do
...@@ -171,8 +171,8 @@ describe Issue, 'Votes' do ...@@ -171,8 +171,8 @@ describe Issue, 'Votes' do
add_note 'Another comment' add_note 'Another comment'
add_note '+1 vote' add_note '+1 vote'
add_note 'final comment' add_note 'final comment'
p issue.downvotes.should == 0 issue.downvotes.should == 0
p issue.upvotes.should == 1 issue.upvotes.should == 1
end end
end end
......
...@@ -10,7 +10,7 @@ describe Member do ...@@ -10,7 +10,7 @@ describe Member do
it { should validate_presence_of(:user) } it { should validate_presence_of(:user) }
it { should validate_presence_of(:source) } it { should validate_presence_of(:source) }
it { should ensure_inclusion_of(:access_level).in_array(Gitlab::Access.values) } it { should validate_inclusion_of(:access_level).in_array(Gitlab::Access.values) }
end end
describe "Delegate methods" do describe "Delegate methods" do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment