Commit b84ee8d1 authored by Valery Sizov's avatar Valery Sizov

fix specs

parent 7c091d70
......@@ -132,7 +132,6 @@ gem 'sidetiq', '~> 0.6.3'
gem "httparty", '~> 0.13.3'
# Colored output to console
gem "colored", '~> 1.2'
gem "colorize", '~> 0.7.0'
# GitLab settings
......
......@@ -131,7 +131,6 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.10.0)
colored (1.2)
colorize (0.7.7)
connection_pool (2.2.0)
coveralls (0.8.9)
......@@ -844,7 +843,6 @@ DEPENDENCIES
carrierwave (~> 0.9.0)
charlock_holmes (~> 0.7.3)
coffee-rails (~> 4.1.0)
colored (~> 1.2)
colorize (~> 0.7.0)
coveralls (~> 0.8.2)
creole (~> 0.5.0)
......
......@@ -11,7 +11,7 @@ class UnsubscribesController < ApplicationController
@user = get_user
if @user
@user.admin_unsubscribe!
Notify.send_unsubscribed_notification(@user).deliver
Notify.send_unsubscribed_notification(@user).deliver_later
end
redirect_to new_user_session_path, notice: 'You have been unsubscribed'
end
......
......@@ -3,7 +3,7 @@ class AdminEmailsWorker
def perform(recipient_id, subject, body)
recipient_list(recipient_id).pluck(:id).each do |user_id|
Notify.delay.send_admin_notification(user_id, subject, body)
Notify.send_admin_notification(user_id, subject, body).deliver_later
end
end
......
......@@ -20,7 +20,7 @@ describe Issues::BulkUpdateService do
end
@params = {
state_event: 'close',
issues_ids: @issues.map(&:id)
issues_ids: @issues.map(&:id).join(",")
}
end
......@@ -43,7 +43,7 @@ describe Issues::BulkUpdateService do
end
@params = {
state_event: 'reopen',
issues_ids: @issues.map(&:id)
issues_ids: @issues.map(&:id).join(",")
}
end
......@@ -63,7 +63,7 @@ describe Issues::BulkUpdateService do
before do
@new_assignee = create :user
@params = {
issues_ids: [issue.id],
issues_ids: issue.id.to_s,
assignee_id: @new_assignee.id
}
end
......@@ -102,7 +102,7 @@ describe Issues::BulkUpdateService do
before do
@milestone = create :milestone
@params = {
issues_ids: [issue.id],
issues_ids: issue.id.to_s,
milestone_id: @milestone.id
}
end
......
......@@ -23,7 +23,9 @@ describe MergeRequests::FfMergeService do
before do
allow(service).to receive(:execute_hooks)
service.execute(merge_request)
perform_enqueued_jobs do
service.execute(merge_request)
end
end
it "should not create merge commit" 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