From d89527839ea0dd1734dacb71c3ed2a97f1ff74d7 Mon Sep 17 00:00:00 2001
From: skv <skv-headless@yandex.ru>
Date: Sat, 14 Dec 2013 17:43:48 +0400
Subject: [PATCH] fix most of warnings
---
app/controllers/admin/projects_controller.rb | 2 +-
app/controllers/admin/users_controller.rb | 3 +--
app/controllers/profiles/keys_controller.rb | 2 +-
.../projects/deploy_keys_controller.rb | 2 +-
app/controllers/projects/hooks_controller.rb | 4 ++--
app/models/project.rb | 6 ++---
app/models/project_team.rb | 4 ++--
app/models/user.rb | 2 +-
app/views/projects/issues/_form.html.haml | 2 +-
.../projects/merge_requests/_form.html.haml | 2 +-
lib/api/namespaces.rb | 2 +-
lib/api/users.rb | 2 +-
spec/contexts/fork_context_spec.rb | 2 +-
.../application_controller_spec.rb | 8 +++----
spec/helpers/application_helper_spec.rb | 22 +++++++++----------
spec/helpers/gitlab_markdown_helper_spec.rb | 4 ++--
spec/helpers/notifications_helper_spec.rb | 2 +-
spec/helpers/search_helper_spec.rb | 6 +++--
spec/helpers/tab_helper_spec.rb | 4 ++--
spec/lib/extracts_path_spec.rb | 2 +-
spec/lib/gitlab/ldap/ldap_user_auth_spec.rb | 4 ++--
spec/lib/oauth_spec.rb | 8 +++----
spec/models/concerns/issuable_spec.rb | 2 +-
spec/models/event_spec.rb | 4 ++--
spec/models/forked_project_link_spec.rb | 2 +-
spec/models/merge_request_spec.rb | 6 ++---
spec/observers/note_observer_spec.rb | 2 +-
spec/requests/api/groups_spec.rb | 2 +-
28 files changed, 57 insertions(+), 56 deletions(-)
diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb
index 0e8335f3d8b..7e3e29f59fb 100644
--- a/app/controllers/admin/projects_controller.rb
+++ b/app/controllers/admin/projects_controller.rb
@@ -7,7 +7,7 @@ class Admin::ProjectsController < Admin::ApplicationController
owner_id = params[:owner_id]
user = User.find_by_id(owner_id)
- @projects = user ? user.owned_projects : Project.scoped
+ @projects = user ? user.owned_projects : Project.all
@projects = @projects.where("visibility_level IN (?)", params[:visibility_levels]) if params[:visibility_levels].present?
@projects = @projects.with_push if params[:with_push].present?
@projects = @projects.abandoned if params[:abandoned].present?
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index c9875b96321..426001e6213 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -2,8 +2,7 @@ class Admin::UsersController < Admin::ApplicationController
before_filter :user, only: [:show, :edit, :update, :destroy]
def index
- @users = User.scoped
- @users = @users.filter(params[:filter])
+ @users = User.filter(params[:filter])
@users = @users.search(params[:name]) if params[:name].present?
@users = @users.alphabetically.page(params[:page])
end
diff --git a/app/controllers/profiles/keys_controller.rb b/app/controllers/profiles/keys_controller.rb
index c36dae2abd3..541319e8d0f 100644
--- a/app/controllers/profiles/keys_controller.rb
+++ b/app/controllers/profiles/keys_controller.rb
@@ -2,7 +2,7 @@ class Profiles::KeysController < ApplicationController
layout "profile"
def index
- @keys = current_user.keys.order('id DESC').all
+ @keys = current_user.keys.order('id DESC')
end
def show
diff --git a/app/controllers/projects/deploy_keys_controller.rb b/app/controllers/projects/deploy_keys_controller.rb
index 0750e0a146f..6e1a76ff417 100644
--- a/app/controllers/projects/deploy_keys_controller.rb
+++ b/app/controllers/projects/deploy_keys_controller.rb
@@ -7,7 +7,7 @@ class Projects::DeployKeysController < Projects::ApplicationController
layout "project_settings"
def index
- @enabled_keys = @project.deploy_keys.all
+ @enabled_keys = @project.deploy_keys
@available_keys = available_keys - @enabled_keys
end
diff --git a/app/controllers/projects/hooks_controller.rb b/app/controllers/projects/hooks_controller.rb
index 1a94dbab5ea..314d87df034 100644
--- a/app/controllers/projects/hooks_controller.rb
+++ b/app/controllers/projects/hooks_controller.rb
@@ -7,7 +7,7 @@ class Projects::HooksController < Projects::ApplicationController
layout "project_settings"
def index
- @hooks = @project.hooks.all
+ @hooks = @project.hooks
@hook = ProjectHook.new
end
@@ -18,7 +18,7 @@ class Projects::HooksController < Projects::ApplicationController
if @hook.valid?
redirect_to project_hooks_path(@project)
else
- @hooks = @project.hooks.all
+ @hooks = @project.hooks
render :index
end
end
diff --git a/app/models/project.rb b/app/models/project.rb
index 39f0d71b337..506f34ca6b6 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -322,14 +322,14 @@ class Project < ActiveRecord::Base
c_ids = self.repository.commits_between(oldrev, newrev).map(&:id)
# Update code for merge requests into project between project branches
- mrs = self.merge_requests.opened.by_branch(branch_name).all
+ mrs = self.merge_requests.opened.by_branch(branch_name).to_a
# Update code for merge requests between project and project fork
- mrs += self.fork_merge_requests.opened.by_branch(branch_name).all
+ mrs += self.fork_merge_requests.opened.by_branch(branch_name).to_a
mrs.each { |merge_request| merge_request.reload_code; merge_request.mark_as_unchecked }
# Close merge requests
- mrs = self.merge_requests.opened.where(target_branch: branch_name).all
+ mrs = self.merge_requests.opened.where(target_branch: branch_name).to_a
mrs = mrs.select(&:last_commit).select { |mr| c_ids.include?(mr.last_commit.id) }
mrs.each { |merge_request| merge_request.merge!(user.id) }
diff --git a/app/models/project_team.rb b/app/models/project_team.rb
index bc35c4041ba..2d438b91c69 100644
--- a/app/models/project_team.rb
+++ b/app/models/project_team.rb
@@ -87,8 +87,8 @@ class ProjectTeam
def import(source_project)
target_project = project
- source_team = source_project.users_projects.all
- target_team = target_project.users_projects.all
+ source_team = source_project.users_projects.to_a
+ target_team = target_project.users_projects.to_a
target_user_ids = target_team.map(&:user_id)
source_team.reject! do |tm|
diff --git a/app/models/user.rb b/app/models/user.rb
index 25a04089d33..d71f2d8de96 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -163,7 +163,7 @@ class User < ActiveRecord::Base
scope :alphabetically, -> { order('name ASC') }
scope :in_team, ->(team){ where(id: team.member_ids) }
scope :not_in_team, ->(team){ where('users.id NOT IN (:ids)', ids: team.member_ids) }
- scope :not_in_project, ->(project) { project.users.present? ? where("id not in (:ids)", ids: project.users.map(&:id) ) : scoped }
+ scope :not_in_project, ->(project) { project.users.present? ? where("id not in (:ids)", ids: project.users.map(&:id) ) : all }
scope :without_projects, -> { where('id NOT IN (SELECT DISTINCT(user_id) FROM users_projects)') }
scope :ldap, -> { where(provider: 'ldap') }
diff --git a/app/views/projects/issues/_form.html.haml b/app/views/projects/issues/_form.html.haml
index 05cfb2788be..d56009fac6e 100644
--- a/app/views/projects/issues/_form.html.haml
+++ b/app/views/projects/issues/_form.html.haml
@@ -29,7 +29,7 @@
= f.label :milestone_id do
%i.icon-time
Milestone
- .controls= f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
+ .controls= f.select(:milestone_id, @project.milestones.active.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
.ui-box-bottom
.control-group
diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml
index abb8a5a3787..b69fcef7f19 100644
--- a/app/views/projects/merge_requests/_form.html.haml
+++ b/app/views/projects/merge_requests/_form.html.haml
@@ -44,7 +44,7 @@
= f.label :milestone_id do
%i.icon-time
Milestone
- .controls= f.select(:milestone_id, @project.milestones.active.all.map {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
+ .controls= f.select(:milestone_id, @project.milestones.active.map {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
.control-group
= f.label :description, "Description"
.controls
diff --git a/lib/api/namespaces.rb b/lib/api/namespaces.rb
index 3a9ab66957e..f9f2ed90ccc 100644
--- a/lib/api/namespaces.rb
+++ b/lib/api/namespaces.rb
@@ -12,7 +12,7 @@ module API
# Example Request:
# GET /namespaces
get do
- @namespaces = Namespace.scoped
+ @namespaces = Namespace.all
@namespaces = @namespaces.search(params[:search]) if params[:search].present?
@namespaces = paginate @namespaces
diff --git a/lib/api/users.rb b/lib/api/users.rb
index 54d3aeecb70..475343a3edf 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -9,7 +9,7 @@ module API
# Example Request:
# GET /users
get do
- @users = User.scoped
+ @users = User.all
@users = @users.active if params[:active].present?
@users = @users.search(params[:search]) if params[:search].present?
@users = paginate @users
diff --git a/spec/contexts/fork_context_spec.rb b/spec/contexts/fork_context_spec.rb
index ed51b0c3f8e..70f650bc83d 100644
--- a/spec/contexts/fork_context_spec.rb
+++ b/spec/contexts/fork_context_spec.rb
@@ -48,7 +48,7 @@ describe Projects::ForkContext do
def fork_project(from_project, user, fork_success = true)
context = Projects::ForkContext.new(from_project, user)
- shell = mock("gitlab_shell")
+ shell = double("gitlab_shell")
shell.stub(fork_repository: fork_success)
context.stub(gitlab_shell: shell)
context.execute
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index d528d12c66c..e1c0269b295 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -8,7 +8,7 @@ describe ApplicationController do
it 'should redirect if the user is over their password expiry' do
user.password_expires_at = Time.new(2002)
user.ldap_user?.should be_false
- controller.stub!(:current_user).and_return(user)
+ controller.stub(:current_user).and_return(user)
controller.should_receive(:redirect_to)
controller.should_receive(:new_profile_password_path)
controller.send(:check_password_expiration)
@@ -17,15 +17,15 @@ describe ApplicationController do
it 'should not redirect if the user is under their password expiry' do
user.password_expires_at = Time.now + 20010101
user.ldap_user?.should be_false
- controller.stub!(:current_user).and_return(user)
+ controller.stub(:current_user).and_return(user)
controller.should_not_receive(:redirect_to)
controller.send(:check_password_expiration)
end
it 'should not redirect if the user is over their password expiry but they are an ldap user' do
user.password_expires_at = Time.new(2002)
- user.stub!(:ldap_user?).and_return(true)
- controller.stub!(:current_user).and_return(user)
+ user.stub(:ldap_user?).and_return(true)
+ controller.stub(:current_user).and_return(user)
controller.should_not_receive(:redirect_to)
controller.send(:check_password_expiration)
end
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index d63a2de8806..21c3e15f57b 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
describe ApplicationHelper do
describe 'current_controller?' do
before do
- controller.stub!(:controller_name).and_return('foo')
+ controller.stub(:controller_name).and_return('foo')
end
it "returns true when controller matches argument" do
@@ -22,7 +22,7 @@ describe ApplicationHelper do
describe 'current_action?' do
before do
- stub!(:action_name).and_return('foo')
+ allow(self).to receive(:action_name).and_return('foo')
end
it "returns true when action matches argument" do
@@ -52,7 +52,7 @@ describe ApplicationHelper do
it "should call gravatar_icon when no avatar is present" do
user = create(:user)
user.save!
- stub!(:gravatar_icon).and_return('gravatar_method_called')
+ allow(self).to receive(:gravatar_icon).and_return('gravatar_method_called')
avatar_icon(user.email).to_s.should == "gravatar_method_called"
end
end
@@ -70,33 +70,33 @@ describe ApplicationHelper do
end
it "should return default gravatar url" do
- stub!(:request).and_return(double(:ssl? => false))
+ allow(self).to receive(:request).and_return(double(:ssl? => false))
gravatar_icon(user_email).should match('http://www.gravatar.com/avatar/b58c6f14d292556214bd64909bcdb118')
end
it "should use SSL when appropriate" do
- stub!(:request).and_return(double(:ssl? => true))
+ allow(self).to receive(:request).and_return(double(:ssl? => true))
gravatar_icon(user_email).should match('https://secure.gravatar.com')
end
it "should return custom gravatar path when gravatar_url is set" do
- stub!(:request).and_return(double(:ssl? => false))
+ allow(self).to receive(:request).and_return(double(:ssl? => false))
Gitlab.config.gravatar.stub(:plain_url).and_return('http://example.local/?s=%{size}&hash=%{hash}')
gravatar_icon(user_email, 20).should == 'http://example.local/?s=20&hash=b58c6f14d292556214bd64909bcdb118'
end
it "should accept a custom size" do
- stub!(:request).and_return(double(:ssl? => false))
+ allow(self).to receive(:request).and_return(double(:ssl? => false))
gravatar_icon(user_email, 64).should match(/\?s=64/)
end
it "should use default size when size is wrong" do
- stub!(:request).and_return(double(:ssl? => false))
+ allow(self).to receive(:request).and_return(double(:ssl? => false))
gravatar_icon(user_email, nil).should match(/\?s=40/)
end
it "should be case insensitive" do
- stub!(:request).and_return(double(:ssl? => false))
+ allow(self).to receive(:request).and_return(double(:ssl? => false))
gravatar_icon(user_email).should == gravatar_icon(user_email.upcase + " ")
end
@@ -105,7 +105,7 @@ describe ApplicationHelper do
describe "user_color_scheme_class" do
context "with current_user is nil" do
it "should return a string" do
- stub!(:current_user).and_return(nil)
+ allow(self).to receive(:current_user).and_return(nil)
user_color_scheme_class.should be_kind_of(String)
end
end
@@ -115,7 +115,7 @@ describe ApplicationHelper do
context "with color_scheme_id == #{color_scheme_id}" do
it "should return a string" do
current_user = double(:color_scheme_id => color_scheme_id)
- stub!(:current_user).and_return(current_user)
+ allow(self).to receive(:current_user).and_return(current_user)
user_color_scheme_class.should be_kind_of(String)
end
end
diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb
index 0c25fa66ece..33e69d4326c 100644
--- a/spec/helpers/gitlab_markdown_helper_spec.rb
+++ b/spec/helpers/gitlab_markdown_helper_spec.rb
@@ -435,7 +435,7 @@ describe GitlabMarkdownHelper do
describe "#render_wiki_content" do
before do
- @wiki = stub('WikiPage')
+ @wiki = double('WikiPage')
@wiki.stub(:content).and_return('wiki content')
end
@@ -449,7 +449,7 @@ describe GitlabMarkdownHelper do
it "should use the Gollum renderer for all other file types" do
@wiki.stub(:format).and_return(:rdoc)
- formatted_content_stub = stub('formatted_content')
+ formatted_content_stub = double('formatted_content')
formatted_content_stub.should_receive(:html_safe)
@wiki.stub(:formatted_content).and_return(formatted_content_stub)
diff --git a/spec/helpers/notifications_helper_spec.rb b/spec/helpers/notifications_helper_spec.rb
index 328f66237c3..c1efc1fb2a0 100644
--- a/spec/helpers/notifications_helper_spec.rb
+++ b/spec/helpers/notifications_helper_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe NotificationsHelper do
describe 'notification_icon' do
- let(:notification) { stub(disabled?: false, participating?: false, watch?: false) }
+ let(:notification) { double(disabled?: false, participating?: false, watch?: false) }
context "disabled notification" do
before { notification.stub(disabled?: true) }
diff --git a/spec/helpers/search_helper_spec.rb b/spec/helpers/search_helper_spec.rb
index 55b6b6b4dad..33ecb980202 100644
--- a/spec/helpers/search_helper_spec.rb
+++ b/spec/helpers/search_helper_spec.rb
@@ -8,7 +8,9 @@ describe SearchHelper do
describe 'search_autocomplete_source' do
context "with no current user" do
- before { stub!(:current_user).and_return(nil) }
+ before do
+ allow(self).to receive(:current_user).and_return(nil)
+ end
it "it returns nil" do
search_autocomplete_source.should be_nil
@@ -20,7 +22,7 @@ describe SearchHelper do
let(:result) { JSON.parse(search_autocomplete_source) }
before do
- stub!(:current_user).and_return(user)
+ allow(self).to receive(:current_user).and_return(user)
end
it "includes Help sections" do
diff --git a/spec/helpers/tab_helper_spec.rb b/spec/helpers/tab_helper_spec.rb
index ef8e4cf6375..fa8a3f554f7 100644
--- a/spec/helpers/tab_helper_spec.rb
+++ b/spec/helpers/tab_helper_spec.rb
@@ -5,8 +5,8 @@ describe TabHelper do
describe 'nav_link' do
before do
- controller.stub!(:controller_name).and_return('foo')
- stub!(:action_name).and_return('foo')
+ controller.stub(:controller_name).and_return('foo')
+ allow(self).to receive(:action_name).and_return('foo')
end
it "captures block output" do
diff --git a/spec/lib/extracts_path_spec.rb b/spec/lib/extracts_path_spec.rb
index aac72c63ea5..7b3818ea5c8 100644
--- a/spec/lib/extracts_path_spec.rb
+++ b/spec/lib/extracts_path_spec.rb
@@ -7,7 +7,7 @@ describe ExtractsPath do
before do
@project = project
- project.stub(repository: stub(ref_names: ['master', 'foo/bar/baz', 'v1.0.0', 'v2.0.0']))
+ project.stub(repository: double(ref_names: ['master', 'foo/bar/baz', 'v1.0.0', 'v2.0.0']))
project.stub(path_with_namespace: 'gitlab/gitlab-ci')
end
diff --git a/spec/lib/gitlab/ldap/ldap_user_auth_spec.rb b/spec/lib/gitlab/ldap/ldap_user_auth_spec.rb
index b1c583c0476..b7d7bbaad2e 100644
--- a/spec/lib/gitlab/ldap/ldap_user_auth_spec.rb
+++ b/spec/lib/gitlab/ldap/ldap_user_auth_spec.rb
@@ -6,7 +6,7 @@ describe Gitlab::LDAP do
before do
Gitlab.config.stub(omniauth: {})
- @info = mock(
+ @info = double(
uid: '12djsak321',
name: 'John',
email: 'john@mail.com'
@@ -15,7 +15,7 @@ describe Gitlab::LDAP do
describe :find_for_ldap_auth do
before do
- @auth = mock(
+ @auth = double(
uid: '12djsak321',
info: @info,
provider: 'ldap'
diff --git a/spec/lib/oauth_spec.rb b/spec/lib/oauth_spec.rb
index e21074554b6..3dfe95a8e38 100644
--- a/spec/lib/oauth_spec.rb
+++ b/spec/lib/oauth_spec.rb
@@ -6,7 +6,7 @@ describe Gitlab::OAuth::User do
before do
Gitlab.config.stub(omniauth: {})
- @info = mock(
+ @info = double(
uid: '12djsak321',
name: 'John',
email: 'john@mail.com'
@@ -15,7 +15,7 @@ describe Gitlab::OAuth::User do
describe :create do
it "should create user from LDAP" do
- @auth = mock(info: @info, provider: 'ldap')
+ @auth = double(info: @info, provider: 'ldap')
user = gl_auth.create(@auth)
user.should be_valid
@@ -24,7 +24,7 @@ describe Gitlab::OAuth::User do
end
it "should create user from Omniauth" do
- @auth = mock(info: @info, provider: 'twitter')
+ @auth = double(info: @info, provider: 'twitter')
user = gl_auth.create(@auth)
user.should be_valid
@@ -33,7 +33,7 @@ describe Gitlab::OAuth::User do
end
it "should apply defaults to user" do
- @auth = mock(info: @info, provider: 'ldap')
+ @auth = double(info: @info, provider: 'ldap')
user = gl_auth.create(@auth)
user.should be_valid
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index 852146ebaec..0827e4f162b 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -34,7 +34,7 @@ describe Issue, "Issuable" do
let!(:searchable_issue) { create(:issue, title: "Searchable issue") }
it "matches by title" do
- described_class.search('able').all.should == [searchable_issue]
+ described_class.search('able').should == [searchable_issue]
end
end
diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb
index 85bdf08ae64..53ede0d5ee9 100644
--- a/spec/models/event_spec.rb
+++ b/spec/models/event_spec.rb
@@ -67,12 +67,12 @@ describe Event do
end
describe 'Team events' do
- let(:user_project) { stub.as_null_object }
+ let(:user_project) { double.as_null_object }
let(:observer) { UsersProjectObserver.instance }
before {
Event.should_receive :create
- observer.stub(notification: stub.as_null_object)
+ observer.stub(notification: double.as_null_object)
}
describe "Joined project team" do
diff --git a/spec/models/forked_project_link_spec.rb b/spec/models/forked_project_link_spec.rb
index 44b8c6155be..472ddf1b59d 100644
--- a/spec/models/forked_project_link_spec.rb
+++ b/spec/models/forked_project_link_spec.rb
@@ -59,7 +59,7 @@ end
def fork_project(from_project, user)
context = Projects::ForkContext.new(from_project, user)
- shell = mock("gitlab_shell")
+ shell = double("gitlab_shell")
shell.stub(fork_repository: true)
context.stub(gitlab_shell: shell)
context.execute
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 3a524158a47..039a0c087ba 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -107,9 +107,9 @@ describe MergeRequest do
describe 'detection of issues to be closed' do
let(:issue0) { create :issue, project: subject.project }
let(:issue1) { create :issue, project: subject.project }
- let(:commit0) { mock('commit0', closes_issues: [issue0]) }
- let(:commit1) { mock('commit1', closes_issues: [issue0]) }
- let(:commit2) { mock('commit2', closes_issues: [issue1]) }
+ let(:commit0) { double('commit0', closes_issues: [issue0]) }
+ let(:commit1) { double('commit1', closes_issues: [issue0]) }
+ let(:commit2) { double('commit2', closes_issues: [issue1]) }
before do
subject.stub(commits: [commit0, commit1, commit2])
diff --git a/spec/observers/note_observer_spec.rb b/spec/observers/note_observer_spec.rb
index f9b96c255c1..f8693355b23 100644
--- a/spec/observers/note_observer_spec.rb
+++ b/spec/observers/note_observer_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe NoteObserver do
subject { NoteObserver.instance }
- before { subject.stub(notification: mock('NotificationService').as_null_object) }
+ before { subject.stub(notification: double('NotificationService').as_null_object) }
let(:team_without_author) { (1..2).map { |n| double :user, id: n } }
let(:note) { double(:note).as_null_object }
diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb
index 25b9a10bd8c..1a5f11038b7 100644
--- a/spec/requests/api/groups_spec.rb
+++ b/spec/requests/api/groups_spec.rb
@@ -147,7 +147,7 @@ describe API::API do
describe "POST /groups/:id/projects/:project_id" do
let(:project) { create(:project) }
before(:each) do
- project.stub!(:transfer).and_return(true)
+ project.stub(:transfer).and_return(true)
Project.stub(:find).and_return(project)
end
--
GitLab