Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into 234-disable_submit_button

This commit is contained in:
Vokhmin Alexey V 2013-07-25 12:17:49 +04:00
parent 50a0cb16c1 520a6537df
commit bb8511be40
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@ -15,9 +15,9 @@ gem 'cancan', '1.6.7' # 1.6.8 fail specs with strange error
gem 'ancestry', '~> 1.3.0' gem 'ancestry', '~> 1.3.0'
gem 'paperclip', '~> 3.3.1' gem 'paperclip', '~> 3.3.1'
gem 'resque', '~> 1.21.0' gem 'resque', '~> 1.24'
gem 'resque-status', '~> 0.3.3' gem 'resque-status', '~> 0.3.3'
gem 'resque_mailer', '~> 2.1.0' gem 'resque_mailer', '~> 2.2'
gem 'perform_later', '~> 1.3.0' # should be after resque_mailer gem 'perform_later', '~> 1.3.0' # should be after resque_mailer
gem 'russian', '~> 0.6.0' gem 'russian', '~> 0.6.0'
gem 'highline', '~> 1.6.11' gem 'highline', '~> 1.6.11'

14
Gemfile.lock
View File

@ -200,6 +200,7 @@ GEM
mock_redis (0.6.2) mock_redis (0.6.2)
momentjs-rails (2.0.0.2) momentjs-rails (2.0.0.2)
railties (>= 3.1) railties (>= 3.1)
mono_logger (1.1.0)
multi_json (1.7.7) multi_json (1.7.7)
multipart-post (1.2.0) multipart-post (1.2.0)
mustache (0.99.4) mustache (0.99.4)
@ -314,17 +315,18 @@ GEM
redisk (0.2.2) redisk (0.2.2)
redis (>= 0.1.1) redis (>= 0.1.1)
redis-namespace (>= 0.1.0) redis-namespace (>= 0.1.0)
resque (1.21.0) resque (1.24.1)
mono_logger (~> 1.0)
multi_json (~> 1.0) multi_json (~> 1.0)
redis-namespace (~> 1.0) redis-namespace (~> 1.2)
sinatra (>= 0.9.2) sinatra (>= 0.9.2)
vegas (~> 0.1.2) vegas (~> 0.1.2)
resque-status (0.3.3) resque-status (0.3.3)
redisk (>= 0.2.1) redisk (>= 0.2.1)
resque (~> 1.19) resque (~> 1.19)
uuid (~> 2.3) uuid (~> 2.3)
resque_mailer (2.1.0) resque_mailer (2.2.4)
actionmailer (~> 3.0) actionmailer (>= 3.0)
rest-client (1.6.7) rest-client (1.6.7)
mime-types (>= 1.16) mime-types (>= 1.16)
rr (1.0.5) rr (1.0.5)
@ -477,9 +479,9 @@ DEPENDENCIES
redcarpet (~> 2.2.2) redcarpet (~> 2.2.2)
redhillonrails_core! redhillonrails_core!
redis-rails redis-rails
resque (~> 1.21.0) resque (~> 1.24)
resque-status (~> 0.3.3) resque-status (~> 0.3.3)
resque_mailer (~> 2.1.0) resque_mailer (~> 2.2)
rest-client (~> 1.6.6) rest-client (~> 1.6.6)
rr (~> 1.0.4) rr (~> 1.0.4)
rspec-rails (~> 2.11.0) rspec-rails (~> 2.11.0)

6
spec/mailers/user_mailer_spec.rb
View File

@ -13,7 +13,7 @@ describe UserMailer do
any_instance_of(Project, :versions => ['v1.0', 'v2.0']) any_instance_of(Project, :versions => ['v1.0', 'v2.0'])
@issue = FactoryGirl.create(:issue, :project_id => @project.id, :assignee_id => @issue_user.id, :user => @issue_user) @issue = FactoryGirl.create(:issue, :project_id => @project.id, :assignee_id => @issue_user.id, :user => @issue_user)
@email = UserMailer.new_issue_notification(@issue, @issue_user).deliver @email = UserMailer.new_issue_notification(@issue, @issue_user).deliver!
end end
it 'should have correct subject' do it 'should have correct subject' do
@ -48,7 +48,7 @@ describe UserMailer do
any_instance_of(Project, :versions => ['v1.0', 'v2.0']) any_instance_of(Project, :versions => ['v1.0', 'v2.0'])
@issue = FactoryGirl.create(:issue, :project_id => @project.id, :assignee_id => @issue_user.id, :user => @issue_user) @issue = FactoryGirl.create(:issue, :project_id => @project.id, :assignee_id => @issue_user.id, :user => @issue_user)
@email = UserMailer.issue_assign_notification(@issue, @user).deliver @email = UserMailer.issue_assign_notification(@issue, @user).deliver!
end end
it 'should have correct subject' do it 'should have correct subject' do
@ -81,7 +81,7 @@ describe UserMailer do
@issue = FactoryGirl.create(:issue, :project_id => @project.id, :assignee_id => @issue_user.id, :user => @issue_user) @issue = FactoryGirl.create(:issue, :project_id => @project.id, :assignee_id => @issue_user.id, :user => @issue_user)
@comment = FactoryGirl.create(:comment, :commentable => @issue, :user_id => @user.id, :project => @project) @comment = FactoryGirl.create(:comment, :commentable => @issue, :user_id => @user.id, :project => @project)
@email = UserMailer.new_comment_notification(@comment, @issue_user).deliver @email = UserMailer.new_comment_notification(@comment, @issue_user).deliver!
end end
it 'should have correct subject' do it 'should have correct subject' do