Skip to content
Snippets Groups Projects
Commit 162cd009 authored by Valery Sizov's avatar Valery Sizov
Browse files

fix deprecation messages in tests

parent e6dadea3
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -37,7 +37,7 @@ class BuildkiteService < CiService
def compose_service_hook
hook = service_hook || build_service_hook
hook.url = webhook_url
hook.enable_ssl_verification = enable_ssl_verification
hook.enable_ssl_verification = !!enable_ssl_verification
hook.save
end
 
Loading
Loading
Loading
Loading
@@ -34,7 +34,7 @@ class DroneCiService < CiService
hook = service_hook || build_service_hook
# If using a service template, project may not be available
hook.url = [drone_url, "/api/hook", "?owner=#{project.namespace.path}", "&name=#{project.path}", "&access_token=#{token}"].join if project
hook.enable_ssl_verification = enable_ssl_verification
hook.enable_ssl_verification = !!enable_ssl_verification
hook.save
end
 
Loading
Loading
Loading
Loading
@@ -690,7 +690,7 @@ class User < ActiveRecord::Base
end
 
def starred?(project)
starred_projects.exists?(project)
starred_projects.exists?(project.id)
end
 
def toggle_star(project)
Loading
Loading
Loading
Loading
@@ -7,7 +7,7 @@
= @project.name
 
%p
Commit: #{link_to @build.short_sha, namespace_project_commit_path(@build.gl_project.namespace, @build.gl_project, @build.sha)}
Commit: #{link_to @build.short_sha, namespace_project_commit_url(@build.gl_project.namespace, @build.gl_project, @build.sha)}
%p
Author: #{@build.commit.git_author_name}
%p
Loading
Loading
Loading
Loading
@@ -260,7 +260,7 @@ module Gitlab
end
 
def link_to_project(object)
if object && !object.projects.exists?(@project)
if object && !object.projects.exists?(@project.id)
object.projects << @project
object.save
end
Loading
Loading
Loading
Loading
@@ -247,7 +247,7 @@ describe Notify do
end
 
describe 'that have been reassigned' do
subject { Notify.reassigned_issue_email(recipient.id, issue.id, previous_assignee.id, current_user) }
subject { Notify.reassigned_issue_email(recipient.id, issue.id, previous_assignee.id, current_user.id) }
 
it_behaves_like 'a multiple recipients email'
it_behaves_like 'an answer to an existing thread', 'issue'
Loading
Loading
@@ -278,7 +278,7 @@ describe Notify do
 
describe 'status changed' do
let(:status) { 'closed' }
subject { Notify.issue_status_changed_email(recipient.id, issue.id, status, current_user) }
subject { Notify.issue_status_changed_email(recipient.id, issue.id, status, current_user.id) }
 
it_behaves_like 'an answer to an existing thread', 'issue'
it_behaves_like 'it should show Gmail Actions View Issue link'
Loading
Loading
@@ -382,7 +382,7 @@ describe Notify do
 
describe 'status changed' do
let(:status) { 'reopened' }
subject { Notify.merge_request_status_email(recipient.id, merge_request.id, status, current_user) }
subject { Notify.merge_request_status_email(recipient.id, merge_request.id, status, current_user.id) }
 
it_behaves_like 'an answer to an existing thread', 'merge_request'
it_behaves_like 'it should show Gmail Actions View Merge request link'
Loading
Loading
@@ -597,8 +597,10 @@ describe Notify do
let(:user) { create(:user, email: 'old-email@mail.com') }
 
before do
user.email = "new-email@mail.com"
user.save
perform_enqueued_jobs do
user.email = "new-email@mail.com"
user.save
end
end
 
subject { ActionMailer::Base.deliveries.last }
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment