Commit f40b99d0 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' into rubocop-for-tests

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/features/issues_spec.rb
	spec/models/forked_project_link_spec.rb
	spec/models/hooks/service_hook_spec.rb
	spec/models/hooks/web_hook_spec.rb
	spec/models/project_services/hipchat_service_spec.rb
	spec/requests/api/project_members_spec.rb
	spec/requests/api/projects_spec.rb
	spec/requests/api/system_hooks_spec.rb
	spec/services/archive_repository_service_spec.rb
	spec/support/matchers.rb
	spec/tasks/gitlab/backup_rake_spec.rb
parents 9369adb9 4aa1fdd3
...@@ -9,6 +9,7 @@ v 7.13.0 (unreleased) ...@@ -9,6 +9,7 @@ v 7.13.0 (unreleased)
- Allow users to customize their default Dashboard page. - Allow users to customize their default Dashboard page.
- Update ssl_ciphers in Nginx example to remove DHE settings. This will deny forward secrecy for Android 2.3.7, Java 6 and OpenSSL 0.9.8 - Update ssl_ciphers in Nginx example to remove DHE settings. This will deny forward secrecy for Android 2.3.7, Java 6 and OpenSSL 0.9.8
- Convert CRLF newlines to LF when committing using the web editor. - Convert CRLF newlines to LF when committing using the web editor.
- API request /projects/:project_id/merge_requests?state=closed will return only closed merge requests without merged one. If you need ones that were merged - use state=merged.
v 7.12.0 (unreleased) v 7.12.0 (unreleased)
- Fix Error 500 when one user attempts to access a personal, internal snippet (Stan Hu) - Fix Error 500 when one user attempts to access a personal, internal snippet (Stan Hu)
...@@ -51,8 +52,8 @@ v 7.12.0 (unreleased) ...@@ -51,8 +52,8 @@ v 7.12.0 (unreleased)
- Add validation to wiki page creation (only [a-zA-Z0-9/_-] are allowed) (Jeroen van Baarsen) - Add validation to wiki page creation (only [a-zA-Z0-9/_-] are allowed) (Jeroen van Baarsen)
- Fix new/empty milestones showing 100% completion value (Jonah Bishop) - Fix new/empty milestones showing 100% completion value (Jonah Bishop)
- Add a note when an Issue or Merge Request's title changes - Add a note when an Issue or Merge Request's title changes
- Consistently refer to MRs as either Accepted or Rejected. - Consistently refer to MRs as either Merged or Closed.
- Add Accepted and Rejected tabs to MR lists. - Add Merged tab to MR lists.
- Prefix EmailsOnPush email subject with `[Git]`. - Prefix EmailsOnPush email subject with `[Git]`.
- Group project contributions by both name and email. - Group project contributions by both name and email.
- Clarify navigation labels for Project Settings and Group Settings. - Clarify navigation labels for Project Settings and Group Settings.
......
...@@ -222,16 +222,16 @@ group :development do ...@@ -222,16 +222,16 @@ group :development do
end end
group :development, :test do group :development, :test do
gem 'awesome_print'
gem 'byebug'
gem 'pry-rails'
gem 'coveralls', require: false gem 'coveralls', require: false
gem 'database_cleaner', '~> 1.4.0'
gem 'factory_girl_rails'
gem 'rspec-rails', '~> 3.3.0'
gem 'rubocop', '0.28.0', require: false gem 'rubocop', '0.28.0', require: false
gem 'spinach-rails' gem 'spinach-rails'
gem "rspec-rails", '2.99'
gem 'capybara', '~> 2.2.1'
gem 'capybara-screenshot', '~> 1.0.0'
gem "pry-rails"
gem "awesome_print"
gem "database_cleaner"
gem 'factory_girl_rails'
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
gem 'minitest', '~> 5.3.0' gem 'minitest', '~> 5.3.0'
...@@ -239,8 +239,9 @@ group :development, :test do ...@@ -239,8 +239,9 @@ group :development, :test do
# Generate Fake data # Generate Fake data
gem 'ffaker', '~> 2.0.0' gem 'ffaker', '~> 2.0.0'
# PhantomJS driver for Capybara gem 'capybara', '~> 2.3.0'
gem 'poltergeist', '~> 1.5.1' gem 'capybara-screenshot', '~> 1.0.0'
gem 'poltergeist', '~> 1.6.0'
gem 'teaspoon', '~> 1.0.0' gem 'teaspoon', '~> 1.0.0'
gem 'teaspoon-jasmine' gem 'teaspoon-jasmine'
...@@ -249,14 +250,12 @@ group :development, :test do ...@@ -249,14 +250,12 @@ group :development, :test do
gem 'spring-commands-rspec', '~> 1.0.0' gem 'spring-commands-rspec', '~> 1.0.0'
gem 'spring-commands-spinach', '~> 1.0.0' gem 'spring-commands-spinach', '~> 1.0.0'
gem 'spring-commands-teaspoon', '~> 0.0.2' gem 'spring-commands-teaspoon', '~> 0.0.2'
gem "byebug"
end end
group :test do group :test do
gem 'simplecov', require: false gem 'simplecov', require: false
gem 'shoulda-matchers', '~> 2.8.0', require: false gem 'shoulda-matchers', '~> 2.8.0', require: false
gem 'email_spec' gem 'email_spec', '~> 1.6.0'
gem 'webmock', '~> 1.21.0' gem 'webmock', '~> 1.21.0'
gem 'test_after_commit' gem 'test_after_commit'
end end
......
...@@ -82,7 +82,7 @@ GEM ...@@ -82,7 +82,7 @@ GEM
columnize (~> 0.8) columnize (~> 0.8)
debugger-linecache (~> 1.2) debugger-linecache (~> 1.2)
cal-heatmap-rails (0.0.1) cal-heatmap-rails (0.0.1)
capybara (2.2.1) capybara (2.3.0)
mime-types (>= 1.16) mime-types (>= 1.16)
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
rack (>= 1.0.0) rack (>= 1.0.0)
...@@ -125,7 +125,7 @@ GEM ...@@ -125,7 +125,7 @@ GEM
d3_rails (3.5.5) d3_rails (3.5.5)
railties (>= 3.1.0) railties (>= 3.1.0)
daemons (1.1.9) daemons (1.1.9)
database_cleaner (1.3.0) database_cleaner (1.4.1)
debug_inspector (0.0.2) debug_inspector (0.0.2)
debugger-linecache (1.2.0) debugger-linecache (1.2.0)
default_value_for (3.0.0) default_value_for (3.0.0)
...@@ -154,7 +154,7 @@ GEM ...@@ -154,7 +154,7 @@ GEM
dotenv (0.9.0) dotenv (0.9.0)
dropzonejs-rails (0.4.14) dropzonejs-rails (0.4.14)
rails (> 3.1) rails (> 3.1)
email_spec (1.5.0) email_spec (1.6.0)
launchy (~> 2.1) launchy (~> 2.1)
mail (~> 2.2) mail (~> 2.2)
encryptor (1.3.0) encryptor (1.3.0)
...@@ -348,7 +348,7 @@ GEM ...@@ -348,7 +348,7 @@ GEM
actionpack (>= 3.0.0) actionpack (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
kgio (2.9.2) kgio (2.9.2)
launchy (2.4.2) launchy (2.4.3)
addressable (~> 2.3) addressable (~> 2.3)
letter_opener (1.1.2) letter_opener (1.1.2)
launchy (~> 2.2) launchy (~> 2.2)
...@@ -431,8 +431,8 @@ GEM ...@@ -431,8 +431,8 @@ GEM
orm_adapter (0.5.0) orm_adapter (0.5.0)
parser (2.2.0.2) parser (2.2.0.2)
ast (>= 1.1, < 3.0) ast (>= 1.1, < 3.0)
pg (0.15.1) pg (0.18.2)
poltergeist (1.5.1) poltergeist (1.6.0)
capybara (~> 2.1) capybara (~> 2.1)
cliver (~> 0.3.1) cliver (~> 0.3.1)
multi_json (~> 1.0) multi_json (~> 1.0)
...@@ -449,7 +449,7 @@ GEM ...@@ -449,7 +449,7 @@ GEM
quiet_assets (1.0.2) quiet_assets (1.0.2)
railties (>= 3.1, < 5.0) railties (>= 3.1, < 5.0)
racc (1.4.10) racc (1.4.10)
rack (1.5.4) rack (1.5.5)
rack-accept (0.4.5) rack-accept (0.4.5)
rack (>= 0.4) rack (>= 0.4)
rack-attack (4.3.0) rack-attack (4.3.0)
...@@ -530,21 +530,23 @@ GEM ...@@ -530,21 +530,23 @@ GEM
rqrcode (0.4.2) rqrcode (0.4.2)
rqrcode-rails3 (0.1.7) rqrcode-rails3 (0.1.7)
rqrcode (>= 0.4.2) rqrcode (>= 0.4.2)
rspec-collection_matchers (1.1.2) rspec-core (3.3.1)
rspec-expectations (>= 2.99.0.beta1) rspec-support (~> 3.3.0)
rspec-core (2.99.2) rspec-expectations (3.3.0)
rspec-expectations (2.99.2) diff-lcs (>= 1.2.0, < 2.0)
diff-lcs (>= 1.1.3, < 2.0) rspec-support (~> 3.3.0)
rspec-mocks (2.99.3) rspec-mocks (3.3.0)
rspec-rails (2.99.0) diff-lcs (>= 1.2.0, < 2.0)
actionpack (>= 3.0) rspec-support (~> 3.3.0)
activemodel (>= 3.0) rspec-rails (3.3.2)
activesupport (>= 3.0) actionpack (>= 3.0, < 4.3)
railties (>= 3.0) activesupport (>= 3.0, < 4.3)
rspec-collection_matchers railties (>= 3.0, < 4.3)
rspec-core (~> 2.99.0) rspec-core (~> 3.3.0)
rspec-expectations (~> 2.99.0) rspec-expectations (~> 3.3.0)
rspec-mocks (~> 2.99.0) rspec-mocks (~> 3.3.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
rubocop (0.28.0) rubocop (0.28.0)
astrolabe (~> 1.3) astrolabe (~> 1.3)
parser (>= 2.2.0.pre.7, < 3.0) parser (>= 2.2.0.pre.7, < 3.0)
...@@ -707,7 +709,9 @@ GEM ...@@ -707,7 +709,9 @@ GEM
webmock (1.21.0) webmock (1.21.0)
addressable (>= 2.3.6) addressable (>= 2.3.6)
crack (>= 0.3.2) crack (>= 0.3.2)
websocket-driver (0.3.3) websocket-driver (0.5.4)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
wikicloth (0.8.1) wikicloth (0.8.1)
builder builder
expression_parser expression_parser
...@@ -735,7 +739,7 @@ DEPENDENCIES ...@@ -735,7 +739,7 @@ DEPENDENCIES
browser (~> 0.8.0) browser (~> 0.8.0)
byebug byebug
cal-heatmap-rails (~> 0.0.1) cal-heatmap-rails (~> 0.0.1)
capybara (~> 2.2.1) capybara (~> 2.3.0)
capybara-screenshot (~> 1.0.0) capybara-screenshot (~> 1.0.0)
carrierwave carrierwave
charlock_holmes charlock_holmes
...@@ -744,7 +748,7 @@ DEPENDENCIES ...@@ -744,7 +748,7 @@ DEPENDENCIES
coveralls coveralls
creole (~> 0.3.6) creole (~> 0.3.6)
d3_rails (~> 3.5.5) d3_rails (~> 3.5.5)
database_cleaner database_cleaner (~> 1.4.0)
default_value_for (~> 3.0.0) default_value_for (~> 3.0.0)
devise (= 3.2.4) devise (= 3.2.4)
devise-async (= 0.9.0) devise-async (= 0.9.0)
...@@ -752,7 +756,7 @@ DEPENDENCIES ...@@ -752,7 +756,7 @@ DEPENDENCIES
diffy (~> 3.0.3) diffy (~> 3.0.3)
doorkeeper (= 2.1.3) doorkeeper (= 2.1.3)
dropzonejs-rails dropzonejs-rails
email_spec email_spec (~> 1.6.0)
enumerize enumerize
factory_girl_rails factory_girl_rails
ffaker (~> 2.0.0) ffaker (~> 2.0.0)
...@@ -800,7 +804,7 @@ DEPENDENCIES ...@@ -800,7 +804,7 @@ DEPENDENCIES
omniauth-twitter omniauth-twitter
org-ruby (= 0.9.12) org-ruby (= 0.9.12)
pg pg
poltergeist (~> 1.5.1) poltergeist (~> 1.6.0)
pry-rails pry-rails
quiet_assets (~> 1.0.1) quiet_assets (~> 1.0.1)
rack-attack (~> 4.3.0) rack-attack (~> 4.3.0)
...@@ -815,7 +819,7 @@ DEPENDENCIES ...@@ -815,7 +819,7 @@ DEPENDENCIES
request_store request_store
rerun (~> 0.10.0) rerun (~> 0.10.0)
rqrcode-rails3 rqrcode-rails3
rspec-rails (= 2.99) rspec-rails (~> 3.3.0)
rubocop (= 0.28.0) rubocop (= 0.28.0)
rugments (~> 1.0.0.beta7) rugments (~> 1.0.0.beta7)
sanitize (~> 2.0) sanitize (~> 2.0)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
The source of GitLab Community Edition is [hosted on GitLab.com](https://gitlab.com/gitlab-org/gitlab-ce/) and there are mirrors to make [contributing](CONTRIBUTING.md) as easy as possible. The source of GitLab Community Edition is [hosted on GitLab.com](https://gitlab.com/gitlab-org/gitlab-ce/) and there are mirrors to make [contributing](CONTRIBUTING.md) as easy as possible.
# ![logo](https://about.gitlab.com/images/gitlab_logo.png) GitLab # ![logo](https://about.gitlab.com/images/logo.svg) GitLab
## Open source software to collaborate on code ## Open source software to collaborate on code
...@@ -101,4 +101,4 @@ Please see [Getting help for GitLab](https://about.gitlab.com/getting-help/) on ...@@ -101,4 +101,4 @@ Please see [Getting help for GitLab](https://about.gitlab.com/getting-help/) on
## Is it awesome? ## Is it awesome?
Thanks for [asking this question](https://twitter.com/supersloth/status/489462789384056832) Joshua. Thanks for [asking this question](https://twitter.com/supersloth/status/489462789384056832) Joshua.
[These people](https://twitter.com/gitlab/favorites) seem to like it. [These people](https://twitter.com/gitlab/favorites) seem to like it.
\ No newline at end of file
class DashboardController < Dashboard::ApplicationController class DashboardController < Dashboard::ApplicationController
before_action :load_projects, except: [:projects] before_action :load_projects
before_action :event_filter, only: :show before_action :event_filter, only: :show
respond_to :html respond_to :html
def show def show
......
...@@ -45,10 +45,10 @@ class IssuableFinder ...@@ -45,10 +45,10 @@ class IssuableFinder
def group def group
return @group if defined?(@group) return @group if defined?(@group)
@group = @group =
if params[:group_id].present? if params[:group_id].present?
Group.find(params[:group_id]) Group.find(params[:group_id])
else else
nil nil
end end
end end
...@@ -56,10 +56,10 @@ class IssuableFinder ...@@ -56,10 +56,10 @@ class IssuableFinder
def project def project
return @project if defined?(@project) return @project if defined?(@project)
@project = @project =
if params[:project_id].present? if params[:project_id].present?
Project.find(params[:project_id]) Project.find(params[:project_id])
else else
nil nil
end end
end end
...@@ -76,7 +76,7 @@ class IssuableFinder ...@@ -76,7 +76,7 @@ class IssuableFinder
return @milestones if defined?(@milestones) return @milestones if defined?(@milestones)
@milestones = @milestones =
if milestones? && params[:milestone_title] != NONE if milestones? && params[:milestone_title] != NONE
Milestone.where(title: params[:milestone_title]) Milestone.where(title: params[:milestone_title])
else else
nil nil
...@@ -90,7 +90,7 @@ class IssuableFinder ...@@ -90,7 +90,7 @@ class IssuableFinder
def assignee def assignee
return @assignee if defined?(@assignee) return @assignee if defined?(@assignee)
@assignee = @assignee =
if assignee? && params[:assignee_id] != NONE if assignee? && params[:assignee_id] != NONE
User.find(params[:assignee_id]) User.find(params[:assignee_id])
else else
...@@ -105,7 +105,7 @@ class IssuableFinder ...@@ -105,7 +105,7 @@ class IssuableFinder
def author def author
return @author if defined?(@author) return @author if defined?(@author)
@author = @author =
if author? && params[:author_id] != NONE if author? && params[:author_id] != NONE
User.find(params[:author_id]) User.find(params[:author_id])
else else
...@@ -148,8 +148,6 @@ class IssuableFinder ...@@ -148,8 +148,6 @@ class IssuableFinder
case params[:state] case params[:state]
when 'closed' when 'closed'
items.closed items.closed
when 'rejected'
items.respond_to?(:rejected) ? items.rejected : items.closed
when 'merged' when 'merged'
items.respond_to?(:merged) ? items.merged : items.closed items.respond_to?(:merged) ? items.merged : items.closed
when 'all' when 'all'
......
...@@ -281,10 +281,9 @@ module ApplicationHelper ...@@ -281,10 +281,9 @@ module ApplicationHelper
def state_filters_text_for(entity, project) def state_filters_text_for(entity, project)
titles = { titles = {
opened: "Open", opened: "Open"
merged: "Accepted"
} }
entity_title = titles[entity] || entity.to_s.humanize entity_title = titles[entity] || entity.to_s.humanize
count = count =
......
module BroadcastMessagesHelper module BroadcastMessagesHelper
def broadcast_styling(broadcast_message) def broadcast_styling(broadcast_message)
if(broadcast_message.color || broadcast_message.font) styling = ''
"background-color:#{broadcast_message.color};color:#{broadcast_message.font}"
else if broadcast_message.color.present?
"" styling << "background-color: #{broadcast_message.color}"
styling << '; ' if broadcast_message.font.present?
end end
if broadcast_message.font.present?
styling << "color: #{broadcast_message.font}"
end
styling
end end
end end
module IconsHelper module IconsHelper
include FontAwesome::Rails::IconHelper
# Creates an icon tag given icon name(s) and possible icon modifiers. # Creates an icon tag given icon name(s) and possible icon modifiers.
# #
# Right now this method simply delegates directly to `fa_icon` from the # Right now this method simply delegates directly to `fa_icon` from the
......
module NotificationsHelper module NotificationsHelper
include IconsHelper
def notification_icon(notification) def notification_icon(notification)
if notification.disabled? if notification.disabled?
icon('volume-off', class: 'ns-mute') icon('volume-off', class: 'ns-mute')
......
...@@ -75,7 +75,7 @@ module Mentionable ...@@ -75,7 +75,7 @@ module Mentionable
refs.reject! { |ref| without.include?(ref) } refs.reject! { |ref| without.include?(ref) }
refs.each do |ref| refs.each do |ref|
Note.create_cross_reference_note(ref, local_reference, a) SystemNoteService.cross_reference(ref, local_reference, a)
end end
end end
......
...@@ -125,16 +125,14 @@ class MergeRequest < ActiveRecord::Base ...@@ -125,16 +125,14 @@ class MergeRequest < ActiveRecord::Base
validate :validate_fork validate :validate_fork
scope :of_group, ->(group) { where("source_project_id in (:group_project_ids) OR target_project_id in (:group_project_ids)", group_project_ids: group.project_ids) } scope :of_group, ->(group) { where("source_project_id in (:group_project_ids) OR target_project_id in (:group_project_ids)", group_project_ids: group.project_ids) }
scope :merged, -> { with_state(:merged) }
scope :by_branch, ->(branch_name) { where("(source_branch LIKE :branch) OR (target_branch LIKE :branch)", branch: branch_name) } scope :by_branch, ->(branch_name) { where("(source_branch LIKE :branch) OR (target_branch LIKE :branch)", branch: branch_name) }
scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) } scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) }
scope :by_milestone, ->(milestone) { where(milestone_id: milestone) } scope :by_milestone, ->(milestone) { where(milestone_id: milestone) }
scope :in_projects, ->(project_ids) { where("source_project_id in (:project_ids) OR target_project_id in (:project_ids)", project_ids: project_ids) } scope :in_projects, ->(project_ids) { where("source_project_id in (:project_ids) OR target_project_id in (:project_ids)", project_ids: project_ids) }
scope :of_projects, ->(ids) { where(target_project_id: ids) } scope :of_projects, ->(ids) { where(target_project_id: ids) }
# Closed scope for merge request should return scope :merged, -> { with_state(:merged) }
# both merged and closed mr's scope :closed, -> { with_state(:closed) }
scope :closed, -> { with_states(:closed, :merged) } scope :closed_and_merged, -> { with_states(:closed, :merged) }
scope :rejected, -> { with_states(:closed) }
def self.reference_prefix def self.reference_prefix
'!' '!'
...@@ -417,4 +415,14 @@ class MergeRequest < ActiveRecord::Base ...@@ -417,4 +415,14 @@ class MergeRequest < ActiveRecord::Base
def can_be_merged_by?(user) def can_be_merged_by?(user)
::Gitlab::GitAccess.new(user, project).can_push_to_branch?(target_branch) ::Gitlab::GitAccess.new(user, project).can_push_to_branch?(target_branch)
end end
def state_human_name
if merged?
"Merged"
elsif closed?
"Closed"
else
"Open"
end
end
end end
...@@ -56,7 +56,7 @@ class Milestone < ActiveRecord::Base ...@@ -56,7 +56,7 @@ class Milestone < ActiveRecord::Base
end end
def closed_items_count def closed_items_count
self.issues.closed.count + self.merge_requests.closed.count self.issues.closed.count + self.merge_requests.closed_and_merged.count
end end
def total_items_count def total_items_count
......
...@@ -63,11 +63,6 @@ class Note < ActiveRecord::Base ...@@ -63,11 +63,6 @@ class Note < ActiveRecord::Base
after_update :set_references after_update :set_references
class << self class << self
# TODO (rspeicher): Update usages
def create_cross_reference_note(*args)
SystemNoteService.cross_reference(*args)
end
def discussions_from_notes(notes) def discussions_from_notes(notes)
discussion_ids = [] discussion_ids = []
discussions = [] discussions = []
......
...@@ -105,7 +105,7 @@ class GitPushService ...@@ -105,7 +105,7 @@ class GitPushService
author ||= commit_user(commit) author ||= commit_user(commit)
refs.each do |r| refs.each do |r|
Note.create_cross_reference_note(r, commit, author) SystemNoteService.cross_reference(r, commit, author)
end end
end end
end end
......
...@@ -15,7 +15,7 @@ module Notes ...@@ -15,7 +15,7 @@ module Notes
# Create a cross-reference note if this Note contains GFM that names an # Create a cross-reference note if this Note contains GFM that names an
# issue, merge request, or commit. # issue, merge request, or commit.
note.references.each do |mentioned| note.references.each do |mentioned|
Note.create_cross_reference_note(mentioned, note.noteable, note.author) SystemNoteService.cross_reference(mentioned, note.noteable, note.author)
end end
execute_hooks(note) execute_hooks(note)
......
...@@ -13,7 +13,7 @@ module Notes ...@@ -13,7 +13,7 @@ module Notes
# Create a cross-reference note if this Note contains GFM that # Create a cross-reference note if this Note contains GFM that
# names an issue, merge request, or commit. # names an issue, merge request, or commit.
note.references.each do |mentioned| note.references.each do |mentioned|
Note.create_cross_reference_note(mentioned, note.noteable, note.author) SystemNoteService.cross_reference(mentioned, note.noteable, note.author)
end end
end end
end end
......
...@@ -9,11 +9,11 @@ ...@@ -9,11 +9,11 @@
- if merge_request.merged? - if merge_request.merged?
%span %span
%i.fa.fa-check %i.fa.fa-check
ACCEPTED MERGED
- elsif merge_request.closed? - elsif merge_request.closed?
%span %span
%i.fa.fa-ban %i.fa.fa-ban
REJECTED CLOSED
- else - else
%span.hidden-xs.hidden-sm %span.hidden-xs.hidden-sm
%span.label-branch< %span.label-branch<
......
%h4.page-title %h4.page-title
.issue-box{ class: issue_box_class(@merge_request) } .issue-box{ class: issue_box_class(@merge_request) }
- if @merge_request.merged? = @merge_request.state_human_name
Accepted
- elsif @merge_request.closed?
Rejected
- else
Open
= "Merge Request ##{@merge_request.iid}" = "Merge Request ##{@merge_request.iid}"
%small.creator %small.creator
&middot; &middot;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
= render 'projects/merge_requests/widget/heading' = render 'projects/merge_requests/widget/heading'
.mr-widget-body .mr-widget-body
%h4 %h4
Rejected Closed
- if @merge_request.closed_event - if @merge_request.closed_event
by #{link_to_member(@project, @merge_request.closed_event.author, avatar: true)} by #{link_to_member(@project, @merge_request.closed_event.author, avatar: true)}
#{time_ago_with_tooltip(@merge_request.closed_event.created_at)} #{time_ago_with_tooltip(@merge_request.closed_event.created_at)}
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
= render 'projects/merge_requests/widget/heading' = render 'projects/merge_requests/widget/heading'
.mr-widget-body .mr-widget-body
%h4 %h4
Accepted Merged
- if @merge_request.merge_event - if @merge_request.merge_event
by #{link_to_member(@project, @merge_request.merge_event.author, avatar: true)} by #{link_to_member(@project, @merge_request.merge_event.author, avatar: true)}
#{time_ago_with_tooltip(@merge_request.merge_event.created_at)} #{time_ago_with_tooltip(@merge_request.merge_event.created_at)}
......
...@@ -86,10 +86,10 @@ ...@@ -86,10 +86,10 @@
.col-md-3 .col-md-3
= render('merge_requests', title: 'Waiting for merge (open and assigned)', merge_requests: @merge_requests.opened.assigned, id: 'ongoing') = render('merge_requests', title: 'Waiting for merge (open and assigned)', merge_requests: @merge_requests.opened.assigned, id: 'ongoing')
.col-md-3 .col-md-3
= render('merge_requests', title: 'Rejected (closed)', merge_requests: @merge_requests.rejected, id: 'closed') = render('merge_requests', title: 'Rejected (closed)', merge_requests: @merge_requests.closed, id: 'closed')
.col-md-3 .col-md-3
.panel.panel-primary .panel.panel-primary
.panel-heading Accepted .panel-heading Merged
%ul.well-list %ul.well-list
- @merge_requests.merged.each do |merge_request| - @merge_requests.merged.each do |merge_request|
= render 'merge_request', merge_request: merge_request = render 'merge_request', merge_request: merge_request
......
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
#{merge_request.project.name_with_namespace} #{merge_request.project.name_with_namespace}
.pull-right .pull-right
- if merge_request.merged? - if merge_request.merged?
%span.label.label-primary Accepted %span.label.label-primary Merged
- elsif merge_request.closed? - elsif merge_request.closed?
%span.label.label-danger Rejected %span.label.label-danger Closed
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
= icon('check-circle') = icon('check-circle')
#{state_filters_text_for(:merged, @project)} #{state_filters_text_for(:merged, @project)}
%li{class: ("active" if params[:state] == 'rejected')} %li{class: ("active" if params[:state] == 'closed')}
= link_to page_filter_path(state: 'rejected') do = link_to page_filter_path(state: 'closed') do
= icon('ban') = icon('ban')
#{state_filters_text_for(:rejected, @project)} #{state_filters_text_for(:closed, @project)}
- else - else
%li{class: ("active" if params[:state] == 'closed')} %li{class: ("active" if params[:state] == 'closed')}
= link_to page_filter_path(state: 'closed') do = link_to page_filter_path(state: 'closed') do
......
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
.row .row
%section.col-md-8 %section.col-md-8
.header-with-avatar .header-with-avatar
= image_tag avatar_icon(@user.email, 90), class: "avatar avatar-tile s90", alt: '' = link_to avatar_icon(@user.email), target: '_blank' do
= image_tag avatar_icon(@user.email, 90), class: "avatar avatar-tile s90", alt: ''
%h3 %h3
= @user.name = @user.name
- if @user == current_user - if @user == current_user
......
...@@ -368,6 +368,9 @@ Make sure to edit the config file to match your setup: ...@@ -368,6 +368,9 @@ Make sure to edit the config file to match your setup:
# Change YOUR_SERVER_FQDN to the fully-qualified # Change YOUR_SERVER_FQDN to the fully-qualified
# domain name of your host serving GitLab. # domain name of your host serving GitLab.
# If using Ubuntu default nginx install:
# either remove the default_server from the listen line
# or else rm -f /etc/sites-enabled/default
sudo editor /etc/nginx/sites-available/gitlab sudo editor /etc/nginx/sites-available/gitlab
**Note:** If you want to use HTTPS, replace the `gitlab` Nginx config with `gitlab-ssl`. See [Using HTTPS](#using-https) for HTTPS configuration details. **Note:** If you want to use HTTPS, replace the `gitlab` Nginx config with `gitlab-ssl`. See [Using HTTPS](#using-https) for HTTPS configuration details.
......
...@@ -39,6 +39,7 @@ Feature: Project Commits Comments ...@@ -39,6 +39,7 @@ Feature: Project Commits Comments
@javascript @javascript
Scenario: I can delete a comment Scenario: I can delete a comment
Given I leave a comment like "XML attached" Given I leave a comment like "XML attached"
Then I should see a comment saying "XML attached"
And I delete a comment And I delete a comment
Then I should not see a comment saying "XML attached" Then I should not see a comment saying "XML attached"
......
...@@ -11,7 +11,7 @@ Feature: Project Merge Requests ...@@ -11,7 +11,7 @@ Feature: Project Merge Requests
And I should not see "Feature NS-03" in merge requests And I should not see "Feature NS-03" in merge requests
Scenario: I should see rejected merge requests Scenario: I should see rejected merge requests
Given I click link "Rejected" Given I click link "Closed"
Then I should see "Feature NS-03" in merge requests Then I should see "Feature NS-03" in merge requests
And I should not see "Bug NS-04" in merge requests And I should not see "Bug NS-04" in merge requests
......
...@@ -69,7 +69,7 @@ Feature: Project Wiki ...@@ -69,7 +69,7 @@ Feature: Project Wiki
And I click on the "Pages" button And I click on the "Pages" button
Then I should see non-escaped link in the pages list Then I should see non-escaped link in the pages list
@javascript @focus @javascript
Scenario: Creating an invalid new page Scenario: Creating an invalid new page
Given I create a New page with an invalid name Given I create a New page with an invalid name
Then I should see an error message Then I should see an error message
......
...@@ -36,6 +36,6 @@ class Spinach::Features::AdminBroadcastMessages < Spinach::FeatureSteps ...@@ -36,6 +36,6 @@ class Spinach::Features::AdminBroadcastMessages < Spinach::FeatureSteps
step 'I should see a customized broadcast message' do step 'I should see a customized broadcast message' do
expect(page).to have_content 'Application update from 4:00 CST to 5:00 CST' expect(page).to have_content 'Application update from 4:00 CST to 5:00 CST'
expect(page).to have_selector %(div[style="background-color:#f2dede;color:#b94a48"]) expect(page).to have_selector %(div[style="background-color: #f2dede; color: #b94a48"])
end end
end end
...@@ -11,9 +11,9 @@ class Spinach::Features::AdminSettings < Spinach::FeatureSteps ...@@ -11,9 +11,9 @@ class Spinach::Features::AdminSettings < Spinach::FeatureSteps
end end
step 'I should see application settings saved' do step 'I should see application settings saved' do
expect(current_application_settings.gravatar_enabled).to be_false expect(current_application_settings.gravatar_enabled).to be_falsey
expect(current_application_settings.home_page_url).to eq 'https://about.gitlab.com/' expect(current_application_settings.home_page_url).to eq "https://about.gitlab.com/"
expect(page).to have_content 'Application settings saved successfully' expect(page).to have_content "Application settings saved successfully"
end end
step 'I click on "Service Templates"' do step 'I click on "Service Templates"' do
......
...@@ -10,7 +10,7 @@ class Spinach::Features::NewProject < Spinach::FeatureSteps ...@@ -10,7 +10,7 @@ class Spinach::Features::NewProject < Spinach::FeatureSteps
end end
step 'I see "New project" page' do step 'I see "New project" page' do
expect(page).to have_content("Project path") expect(page).to have_content('Project path')
end end
step 'I click on "Import project from GitHub"' do step 'I click on "Import project from GitHub"' do
......
...@@ -128,14 +128,14 @@ class Spinach::Features::Groups < Spinach::FeatureSteps ...@@ -128,14 +128,14 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
end end
step 'I change group "Owned" avatar' do step 'I change group "Owned" avatar' do
attach_file(:group_avatar, File.join(Rails.root, 'public', 'gitlab_logo.png')) attach_file(:group_avatar, File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif'))
click_button "Save group" click_button "Save group"
Group.find_by(name: "Owned").reload Group.find_by(name: "Owned").reload
end end
step 'I should see new group "Owned" avatar' do step 'I should see new group "Owned" avatar' do
expect(Group.find_by(name: "Owned").avatar).to be_instance_of AvatarUploader expect(Group.find_by(name: "Owned").avatar).to be_instance_of AvatarUploader
expect(Group.find_by(name: "Owned").avatar.url).to eq "/uploads/group/avatar/#{ Group.find_by(name:"Owned").id }/gitlab_logo.png" expect(Group.find_by(name: "Owned").avatar.url).to eq "/uploads/group/avatar/#{ Group.find_by(name:"Owned").id }/banana_sample.gif"
end end
step 'I should see the "Remove avatar" button' do step 'I should see the "Remove avatar" button' do
...@@ -143,7 +143,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps ...@@ -143,7 +143,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
end end
step 'I have group "Owned" avatar' do step 'I have group "Owned" avatar' do
attach_file(:group_avatar, File.join(Rails.root, 'public', 'gitlab_logo.png')) attach_file(:group_avatar, File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif'))
click_button "Save group" click_button "Save group"
Group.find_by(name: "Owned").reload Group.find_by(name: "Owned").reload
end end
...@@ -154,7 +154,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps ...@@ -154,7 +154,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
end end
step 'I should not see group "Owned" avatar' do step 'I should not see group "Owned" avatar' do
expect(Group.find_by(name: "Owned").avatar?).to be_false expect(Group.find_by(name: "Owned").avatar?).to eq false
end end
step 'I should not see the "Remove avatar" button' do step 'I should not see the "Remove avatar" button' do
......
...@@ -27,14 +27,14 @@ class Spinach::Features::Profile < Spinach::FeatureSteps ...@@ -27,14 +27,14 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
end end
step 'I change my avatar' do step 'I change my avatar' do
attach_file(:user_avatar, File.join(Rails.root, 'public', 'gitlab_logo.png')) attach_file(:user_avatar, File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif'))
click_button "Save changes" click_button "Save changes"
@user.reload @user.reload
end end
step 'I should see new avatar' do step 'I should see new avatar' do
expect(@user.avatar).to be_instance_of AvatarUploader expect(@user.avatar).to be_instance_of AvatarUploader
expect(@user.avatar.url).to eq "/uploads/user/avatar/#{ @user.id }/gitlab_logo.png" expect(@user.avatar.url).to eq "/uploads/user/avatar/#{ @user.id }/banana_sample.gif"
end end
step 'I should see the "Remove avatar" button' do step 'I should see the "Remove avatar" button' do
...@@ -42,7 +42,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps ...@@ -42,7 +42,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
end end
step 'I have an avatar' do step 'I have an avatar' do
attach_file(:user_avatar, File.join(Rails.root, 'public', 'gitlab_logo.png')) attach_file(:user_avatar, File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif'))
click_button "Save changes" click_button "Save changes"
@user.reload @user.reload
end end
...@@ -53,7 +53,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps ...@@ -53,7 +53,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
end end
step 'I should see my gravatar' do step 'I should see my gravatar' do
expect(@user.avatar?).to be_false expect(@user.avatar?).to eq false
end end
step 'I should not see the "Remove avatar" button' do step 'I should not see the "Remove avatar" button' do
...@@ -87,11 +87,15 @@ class Spinach::Features::Profile < Spinach::FeatureSteps ...@@ -87,11 +87,15 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
end end
step "I should see a missing password error message" do step "I should see a missing password error message" do
expect(page).to have_content "You must provide a valid current password" page.within ".flash-container" do
expect(page).to have_content "You must provide a valid current password"
end
end end
step "I should see a password error message" do step "I should see a password error message" do
expect(page).to have_content "Password confirmation doesn't match" page.within '.alert' do
expect(page).to have_content "Password confirmation doesn't match"
end
end end
step 'I reset my token' do step 'I reset my token' do
...@@ -120,7 +124,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps ...@@ -120,7 +124,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
step "I am not an ldap user" do step "I am not an ldap user" do
current_user.identities.delete current_user.identities.delete
expect(current_user.ldap_user?).to be_false expect(current_user.ldap_user?).to eq false
end end
step 'I redirected to expired password page' do step 'I redirected to expired password page' do
......
...@@ -19,8 +19,8 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps ...@@ -19,8 +19,8 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
click_link "All" click_link "All"
end end
step 'I click link "Rejected"' do step 'I click link "Closed"' do
click_link "Rejected" click_link "Closed"
end end
step 'I should see merge request "Wiki Feature"' do step 'I should see merge request "Wiki Feature"' do
...@@ -31,8 +31,8 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps ...@@ -31,8 +31,8 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
step 'I should see closed merge request "Bug NS-04"' do step 'I should see closed merge request "Bug NS-04"' do
merge_request = MergeRequest.find_by!(title: "Bug NS-04") merge_request = MergeRequest.find_by!(title: "Bug NS-04")
expect(merge_request.closed?).to be_true expect(merge_request).to be_closed
expect(page).to have_content "Rejected by" expect(page).to have_content "Closed by"
end end
step 'I should see merge request "Bug NS-04"' do step 'I should see merge request "Bug NS-04"' do
...@@ -125,7 +125,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps ...@@ -125,7 +125,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
expect(buttons.count).to eq(2) expect(buttons.count).to eq(2)
buttons.each do |b| buttons.each do |b|
expect(expect(b['href'])).not_to have_content('json') expect(b['href']).not_to have_content('json')
end end
end end
...@@ -164,20 +164,26 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps ...@@ -164,20 +164,26 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end end
step 'I should see a discussion has started on diff' do step 'I should see a discussion has started on diff' do
expect(page).to have_content "#{current_user.name} started a discussion" page.within(".notes .discussion") do
expect(page).to have_content sample_commit.line_code_path page.should have_content "#{current_user.name} started a discussion"
expect(page).to have_content "Line is wrong" page.should have_content sample_commit.line_code_path
page.should have_content "Line is wrong"
end
end end
step 'I should see a discussion has started on commit diff' do step 'I should see a discussion has started on commit diff' do
expect(page).to have_content "#{current_user.name} started a discussion on commit" page.within(".notes .discussion") do
expect(page).to have_content sample_commit.line_code_path page.should have_content "#{current_user.name} started a discussion on commit"
expect(page).to have_content "Line is wrong" page.should have_content sample_commit.line_code_path
page.should have_content "Line is wrong"
end
end end
step 'I should see a discussion has started on commit' do step 'I should see a discussion has started on commit' do
expect(page).to have_content "#{current_user.name} started a discussion on commit" page.within(".notes .discussion") do
expect(page).to have_content "One comment to rule them all" page.should have_content "#{current_user.name} started a discussion on commit"
page.should have_content "One comment to rule them all"
end
end end
step 'merge request is mergeable' do step 'merge request is mergeable' do
...@@ -206,7 +212,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps ...@@ -206,7 +212,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
step 'I should see merged request' do step 'I should see merged request' do
page.within '.issue-box' do page.within '.issue-box' do
expect(page).to have_content "Accepted" expect(page).to have_content "Merged"
end end
end end
...@@ -329,12 +335,13 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps ...@@ -329,12 +335,13 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end end
def leave_comment(message) def leave_comment(message)
page.within(".js-discussion-note-form") do page.within(".js-discussion-note-form", visible: true) do
fill_in "note_note", with: message fill_in "note_note", with: message
click_button "Add Comment" click_button "Add Comment"
end end
page.within(".notes_holder", visible: true) do
expect(page).to have_content message expect(page).to have_content message
end
end end
def init_diff_note_first_file def init_diff_note_first_file
......
...@@ -28,7 +28,7 @@ class Spinach::Features::Project < Spinach::FeatureSteps ...@@ -28,7 +28,7 @@ class Spinach::Features::Project < Spinach::FeatureSteps
step 'I change the project avatar' do step 'I change the project avatar' do
attach_file( attach_file(
:project_avatar, :project_avatar,
File.join(Rails.root, 'public', 'gitlab_logo.png') File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif')
) )
click_button 'Save changes' click_button 'Save changes'
@project.reload @project.reload
...@@ -37,7 +37,7 @@ class Spinach::Features::Project < Spinach::FeatureSteps ...@@ -37,7 +37,7 @@ class Spinach::Features::Project < Spinach::FeatureSteps
step 'I should see new project avatar' do step 'I should see new project avatar' do
expect(@project.avatar).to be_instance_of AvatarUploader expect(@project.avatar).to be_instance_of AvatarUploader
url = @project.avatar.url url = @project.avatar.url
expect(url).to eq "/uploads/project/avatar/#{ @project.id }/gitlab_logo.png" expect(url).to eq "/uploads/project/avatar/#{ @project.id }/banana_sample.gif"
end end
step 'I should see the "Remove avatar" button' do step 'I should see the "Remove avatar" button' do
...@@ -47,7 +47,7 @@ class Spinach::Features::Project < Spinach::FeatureSteps ...@@ -47,7 +47,7 @@ class Spinach::Features::Project < Spinach::FeatureSteps
step 'I have an project avatar' do step 'I have an project avatar' do
attach_file( attach_file(
:project_avatar, :project_avatar,
File.join(Rails.root, 'public', 'gitlab_logo.png') File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif')
) )
click_button 'Save changes' click_button 'Save changes'
@project.reload @project.reload
...@@ -59,7 +59,7 @@ class Spinach::Features::Project < Spinach::FeatureSteps ...@@ -59,7 +59,7 @@ class Spinach::Features::Project < Spinach::FeatureSteps
end end
step 'I should see the default project avatar' do step 'I should see the default project avatar' do
expect(@project.avatar?).to be_false expect(@project.avatar?).to eq false
end end
step 'I should not see the "Remove avatar" button' do step 'I should not see the "Remove avatar" button' do
......
...@@ -52,7 +52,9 @@ class Spinach::Features::Search < Spinach::FeatureSteps ...@@ -52,7 +52,9 @@ class Spinach::Features::Search < Spinach::FeatureSteps
end end
step 'I should see code results for project "Shop"' do step 'I should see code results for project "Shop"' do
expect(page).to have_content 'Update capybara, rspec-rails, poltergeist to recent versions' page.within('.results') do
page.should have_content 'Update capybara, rspec-rails, poltergeist to recent versions'
end
end end
step 'I search for "Contibuting"' do step 'I search for "Contibuting"' do
...@@ -71,7 +73,9 @@ class Spinach::Features::Search < Spinach::FeatureSteps ...@@ -71,7 +73,9 @@ class Spinach::Features::Search < Spinach::FeatureSteps
end end
step 'I should see "Foo" link in the search results' do step 'I should see "Foo" link in the search results' do
expect(find(:css, '.search-results')).to have_link 'Foo' page.within('.results') do
find(:css, '.search-results').should have_link 'Foo'
end
end end
step 'I should not see "Bar" link in the search results' do step 'I should not see "Bar" link in the search results' do
...@@ -79,7 +83,9 @@ class Spinach::Features::Search < Spinach::FeatureSteps ...@@ -79,7 +83,9 @@ class Spinach::Features::Search < Spinach::FeatureSteps
end end
step 'I should see "test_wiki" link in the search results' do step 'I should see "test_wiki" link in the search results' do
expect(find(:css, '.search-results')).to have_link 'test_wiki.md' page.within('.results') do
find(:css, '.search-results').should have_link 'test_wiki.md'
end
end end
step 'project has Wiki content' do step 'project has Wiki content' do
......
...@@ -20,11 +20,14 @@ module SharedDiffNote ...@@ -20,11 +20,14 @@ module SharedDiffNote
end end
step 'I leave a diff comment like "Typo, please fix"' do step 'I leave a diff comment like "Typo, please fix"' do
click_diff_line(sample_commit.line_code) page.within(diff_file_selector) do
page.within("#{diff_file_selector} form[rel$='#{sample_commit.line_code}']") do click_diff_line(sample_commit.line_code)
fill_in "note[note]", with: "Typo, please fix"
find(".js-comment-button").trigger("click") page.within("form[rel$='#{sample_commit.line_code}']") do
sleep 0.05 fill_in "note[note]", with: "Typo, please fix"
find(".js-comment-button").trigger("click")
sleep 0.05
end
end end
end end
...@@ -45,28 +48,37 @@ module SharedDiffNote ...@@ -45,28 +48,37 @@ module SharedDiffNote
end end
step 'I preview a diff comment text like "Should fix it :smile:"' do step 'I preview a diff comment text like "Should fix it :smile:"' do
click_diff_line(sample_commit.line_code) page.within(diff_file_selector) do
page.within("#{diff_file_selector} form[rel$='#{sample_commit.line_code}']") do click_diff_line(sample_commit.line_code)
fill_in "note[note]", with: "Should fix it :smile:"
find('.js-md-preview-button').click page.within("form[rel$='#{sample_commit.line_code}']") do
fill_in "note[note]", with: "Should fix it :smile:"
find('.js-md-preview-button').click
end
end end
end end
step 'I preview another diff comment text like "DRY this up"' do step 'I preview another diff comment text like "DRY this up"' do
click_diff_line(sample_commit.del_line_code) page.within(diff_file_selector) do
click_diff_line(sample_commit.del_line_code)
page.within("#{diff_file_selector} form[rel$='#{sample_commit.del_line_code}']") do page.within("form[rel$='#{sample_commit.del_line_code}']") do
fill_in "note[note]", with: "DRY this up" fill_in "note[note]", with: "DRY this up"
find('.js-md-preview-button').click find('.js-md-preview-button').click
end
end end
end end
step 'I open a diff comment form' do step 'I open a diff comment form' do
click_diff_line(sample_commit.line_code) page.within(diff_file_selector) do
click_diff_line(sample_commit.line_code)
end
end end
step 'I open another diff comment form' do step 'I open another diff comment form' do
click_diff_line(sample_commit.del_line_code) page.within(diff_file_selector) do
click_diff_line(sample_commit.del_line_code)
end
end end
step 'I write a diff comment like ":-1: I don\'t like this"' do step 'I write a diff comment like ":-1: I don\'t like this"' do
...@@ -194,7 +206,7 @@ module SharedDiffNote ...@@ -194,7 +206,7 @@ module SharedDiffNote
end end
def diff_file_selector def diff_file_selector
".diff-file:nth-of-type(1)" '.diff-file:nth-of-type(1)'
end end
def click_diff_line(code) def click_diff_line(code)
......
...@@ -2,8 +2,10 @@ module SharedNote ...@@ -2,8 +2,10 @@ module SharedNote
include Spinach::DSL include Spinach::DSL
step 'I delete a comment' do step 'I delete a comment' do
find('.note').hover page.within('.notes') do
find(".js-note-delete").click find('.note').hover
find(".js-note-delete").click
end
end end
step 'I haven\'t written any comment text' do step 'I haven\'t written any comment text' do
...@@ -16,7 +18,6 @@ module SharedNote ...@@ -16,7 +18,6 @@ module SharedNote
page.within(".js-main-target-form") do page.within(".js-main-target-form") do
fill_in "note[note]", with: "XML attached" fill_in "note[note]", with: "XML attached"
click_button "Add Comment" click_button "Add Comment"
sleep 0.05
end end
end end
...@@ -123,13 +124,14 @@ module SharedNote ...@@ -123,13 +124,14 @@ module SharedNote
end end
step 'I edit the last comment with a +1' do step 'I edit the last comment with a +1' do
find(".note").hover page.within(".notes") do
find('.js-note-edit').click find(".note").hover
find('.js-note-edit').click
end
page.within(".current-note-edit-form") do page.within(".current-note-edit-form") do
fill_in 'note[note]', with: '+1 Awesome!' fill_in 'note[note]', with: '+1 Awesome!'
click_button 'Save Comment' click_button 'Save Comment'
sleep 0.05
end end
end end
......
...@@ -25,6 +25,7 @@ WebMock.allow_net_connect! ...@@ -25,6 +25,7 @@ WebMock.allow_net_connect!
Spinach.hooks.before_run do Spinach.hooks.before_run do
include RSpec::Mocks::ExampleMethods include RSpec::Mocks::ExampleMethods
RSpec::Mocks.setup
TestEnv.init(mailer: false) TestEnv.init(mailer: false)
include FactoryGirl::Syntax::Methods include FactoryGirl::Syntax::Methods
......
...@@ -40,6 +40,10 @@ upstream gitlab { ...@@ -40,6 +40,10 @@ upstream gitlab {
## Normal HTTP host ## Normal HTTP host
server { server {
## Either remove "default_server" from the listen line below,
## or delete the /etc/nginx/sites-enabled/default file. This will cause gitlab
## to be served if you visit any address that your server responds to, eg.
## the ip address of the server (http://x.x.x.x/)n 0.0.0.0:80 default_server;
listen 0.0.0.0:80 default_server; listen 0.0.0.0:80 default_server;
listen [::]:80 default_server; listen [::]:80 default_server;
server_name YOUR_SERVER_FQDN; ## Replace this with something like gitlab.example.com server_name YOUR_SERVER_FQDN; ## Replace this with something like gitlab.example.com
......
...@@ -44,6 +44,10 @@ upstream gitlab { ...@@ -44,6 +44,10 @@ upstream gitlab {
## Redirects all HTTP traffic to the HTTPS host ## Redirects all HTTP traffic to the HTTPS host
server { server {
## Either remove "default_server" from the listen line below,
## or delete the /etc/nginx/sites-enabled/default file. This will cause gitlab
## to be served if you visit any address that your server responds to, eg.
## the ip address of the server (http://x.x.x.x/)
listen 0.0.0.0:80; listen 0.0.0.0:80;
listen [::]:80 ipv6only=on default_server; listen [::]:80 ipv6only=on default_server;
server_name YOUR_SERVER_FQDN; ## Replace this with something like gitlab.example.com server_name YOUR_SERVER_FQDN; ## Replace this with something like gitlab.example.com
......
...@@ -16,7 +16,7 @@ describe AutocompleteController do ...@@ -16,7 +16,7 @@ describe AutocompleteController do
let(:body) { JSON.parse(response.body) } let(:body) { JSON.parse(response.body) }
it { expect(body).to be_kind_of(Array) } it { expect(body).to be_kind_of(Array) }
it { expect(body.size).to eq(1) } it { expect(body.size).to eq 1 }
it { expect(body.first["username"]).to eq user.username } it { expect(body.first["username"]).to eq user.username }
end end
...@@ -33,7 +33,7 @@ describe AutocompleteController do ...@@ -33,7 +33,7 @@ describe AutocompleteController do
let(:body) { JSON.parse(response.body) } let(:body) { JSON.parse(response.body) }
it { expect(body).to be_kind_of(Array) } it { expect(body).to be_kind_of(Array) }
it { expect(body.size).to eq(1) } it { expect(body.size).to eq 1 }
it { expect(body.first["username"]).to eq user.username } it { expect(body.first["username"]).to eq user.username }
end end
...@@ -46,6 +46,6 @@ describe AutocompleteController do ...@@ -46,6 +46,6 @@ describe AutocompleteController do
let(:body) { JSON.parse(response.body) } let(:body) { JSON.parse(response.body) }
it { expect(body).to be_kind_of(Array) } it { expect(body).to be_kind_of(Array) }
it { expect(body.size).to eq(User.count) } it { expect(body.size).to eq User.count }
end end
end end
...@@ -49,10 +49,10 @@ describe Projects::CommitController do ...@@ -49,10 +49,10 @@ describe Projects::CommitController do
project_id: project.to_param, project_id: project.to_param,
id: commit.id, format: format) id: commit.id, format: format)
expect(response.body).to_not include('&amp;') expect(response.body).not_to include('&amp;')
expect(response.body).to_not include('&gt;') expect(response.body).not_to include('&gt;')
expect(response.body).to_not include('&lt;') expect(response.body).not_to include('&lt;')
expect(response.body).to_not include('&quot;') expect(response.body).not_to include('&quot;')
end end
end end
......
require 'spec_helper' require 'spec_helper'
require_relative 'import_spec_helper'
describe Import::BitbucketController do describe Import::BitbucketController do
include ImportSpecHelper
let(:user) { create(:user, bitbucket_access_token: 'asd123', bitbucket_access_token_secret: "sekret") } let(:user) { create(:user, bitbucket_access_token: 'asd123', bitbucket_access_token_secret: "sekret") }
before do before do
sign_in(user) sign_in(user)
controller.stub(:bitbucket_import_enabled?).and_return(true) allow(controller).to receive(:bitbucket_import_enabled?).and_return(true)
end end
describe "GET callback" do describe "GET callback" do
...@@ -17,8 +20,9 @@ describe Import::BitbucketController do ...@@ -17,8 +20,9 @@ describe Import::BitbucketController do
token = "asdasd12345" token = "asdasd12345"
secret = "sekrettt" secret = "sekrettt"
access_token = double(token: token, secret: secret) access_token = double(token: token, secret: secret)
Gitlab::BitbucketImport::Client.any_instance.stub(:get_token).and_return(access_token) allow_any_instance_of(Gitlab::BitbucketImport::Client).
Gitlab.config.omniauth.providers << OpenStruct.new(app_id: "asd123", app_secret: "asd123", name: "bitbucket") to receive(:get_token).and_return(access_token)
stub_omniauth_provider('bitbucket')
get :callback get :callback
...@@ -35,7 +39,7 @@ describe Import::BitbucketController do ...@@ -35,7 +39,7 @@ describe Import::BitbucketController do
it "assigns variables" do it "assigns variables" do
@project = create(:project, import_type: 'bitbucket', creator_id: user.id) @project = create(:project, import_type: 'bitbucket', creator_id: user.id)
controller.stub_chain(:client, :projects).and_return([@repo]) stub_client(projects: [@repo])
get :status get :status
...@@ -45,7 +49,7 @@ describe Import::BitbucketController do ...@@ -45,7 +49,7 @@ describe Import::BitbucketController do
it "does not show already added project" do it "does not show already added project" do
@project = create(:project, import_type: 'bitbucket', creator_id: user.id, import_source: 'asd/vim') @project = create(:project, import_type: 'bitbucket', creator_id: user.id, import_source: 'asd/vim')
controller.stub_chain(:client, :projects).and_return([@repo]) stub_client(projects: [@repo])
get :status get :status
...@@ -70,8 +74,7 @@ describe Import::BitbucketController do ...@@ -70,8 +74,7 @@ describe Import::BitbucketController do
to receive(:new).with(bitbucket_repo, user). to receive(:new).with(bitbucket_repo, user).
and_return(double(execute: true)) and_return(double(execute: true))
controller.stub_chain(:client, :user).and_return(bitbucket_user) stub_client(user: bitbucket_user, project: bitbucket_repo)
controller.stub_chain(:client, :project).and_return(bitbucket_repo)
end end
context "when the repository owner is the Bitbucket user" do context "when the repository owner is the Bitbucket user" do
......
require 'spec_helper' require 'spec_helper'
require_relative 'import_spec_helper'
describe Import::GithubController do describe Import::GithubController do
include ImportSpecHelper
let(:user) { create(:user, github_access_token: 'asd123') } let(:user) { create(:user, github_access_token: 'asd123') }
before do before do
sign_in(user) sign_in(user)
controller.stub(:github_import_enabled?).and_return(true) allow(controller).to receive(:github_import_enabled?).and_return(true)
end end
describe "GET callback" do describe "GET callback" do
...@@ -13,9 +16,7 @@ describe Import::GithubController do ...@@ -13,9 +16,7 @@ describe Import::GithubController do
token = "asdasd12345" token = "asdasd12345"
allow_any_instance_of(Gitlab::GithubImport::Client). allow_any_instance_of(Gitlab::GithubImport::Client).
to receive(:get_token).and_return(token) to receive(:get_token).and_return(token)
Gitlab.config.omniauth.providers << OpenStruct.new(app_id: 'asd123', stub_omniauth_provider('github')
app_secret: 'asd123',
name: 'github')
get :callback get :callback
...@@ -33,9 +34,7 @@ describe Import::GithubController do ...@@ -33,9 +34,7 @@ describe Import::GithubController do
it "assigns variables" do it "assigns variables" do
@project = create(:project, import_type: 'github', creator_id: user.id) @project = create(:project, import_type: 'github', creator_id: user.id)
controller.stub_chain(:client, :repos).and_return([@repo]) stub_client(repos: [@repo], orgs: [@org], org_repos: [@org_repo])
controller.stub_chain(:client, :orgs).and_return([@org])
controller.stub_chain(:client, :org_repos).with(@org.login).and_return([@org_repo])
get :status get :status
...@@ -45,8 +44,7 @@ describe Import::GithubController do ...@@ -45,8 +44,7 @@ describe Import::GithubController do
it "does not show already added project" do it "does not show already added project" do
@project = create(:project, import_type: 'github', creator_id: user.id, import_source: 'asd/vim') @project = create(:project, import_type: 'github', creator_id: user.id, import_source: 'asd/vim')
controller.stub_chain(:client, :repos).and_return([@repo]) stub_client(repos: [@repo], orgs: [])
controller.stub_chain(:client, :orgs).and_return([])
get :status get :status
...@@ -67,8 +65,7 @@ describe Import::GithubController do ...@@ -67,8 +65,7 @@ describe Import::GithubController do
end end
before do before do
controller.stub_chain(:client, :user).and_return(github_user) stub_client(user: github_user, repo: github_repo)
controller.stub_chain(:client, :repo).and_return(github_repo)
end end
context "when the repository owner is the GitHub user" do context "when the repository owner is the GitHub user" do
......
require 'spec_helper' require 'spec_helper'
require_relative 'import_spec_helper'
describe Import::GitlabController do describe Import::GitlabController do
include ImportSpecHelper
let(:user) { create(:user, gitlab_access_token: 'asd123') } let(:user) { create(:user, gitlab_access_token: 'asd123') }
before do before do
sign_in(user) sign_in(user)
controller.stub(:gitlab_import_enabled?).and_return(true) allow(controller).to receive(:gitlab_import_enabled?).and_return(true)
end end
describe "GET callback" do describe "GET callback" do
it "updates access token" do it "updates access token" do
token = "asdasd12345" token = "asdasd12345"
Gitlab::GitlabImport::Client.any_instance.stub_chain(:client, :auth_code, :get_token, :token).and_return(token) allow_any_instance_of(Gitlab::GitlabImport::Client).
Gitlab.config.omniauth.providers << OpenStruct.new(app_id: "asd123", app_secret: "asd123", name: "gitlab") to receive(:get_token).and_return(token)
stub_omniauth_provider('gitlab')
get :callback get :callback
...@@ -28,7 +32,7 @@ describe Import::GitlabController do ...@@ -28,7 +32,7 @@ describe Import::GitlabController do
it "assigns variables" do it "assigns variables" do
@project = create(:project, import_type: 'gitlab', creator_id: user.id) @project = create(:project, import_type: 'gitlab', creator_id: user.id)
controller.stub_chain(:client, :projects).and_return([@repo]) stub_client(projects: [@repo])
get :status get :status
...@@ -38,7 +42,7 @@ describe Import::GitlabController do ...@@ -38,7 +42,7 @@ describe Import::GitlabController do
it "does not show already added project" do it "does not show already added project" do
@project = create(:project, import_type: 'gitlab', creator_id: user.id, import_source: 'asd/vim') @project = create(:project, import_type: 'gitlab', creator_id: user.id, import_source: 'asd/vim')
controller.stub_chain(:client, :projects).and_return([@repo]) stub_client(projects: [@repo])
get :status get :status
...@@ -62,8 +66,7 @@ describe Import::GitlabController do ...@@ -62,8 +66,7 @@ describe Import::GitlabController do
end end
before do before do
controller.stub_chain(:client, :user).and_return(gitlab_user) stub_client(user: gitlab_user, project: gitlab_repo)
controller.stub_chain(:client, :project).and_return(gitlab_repo)
end end
context "when the repository owner is the GitLab.com user" do context "when the repository owner is the GitLab.com user" do
......
require 'spec_helper' require 'spec_helper'
require_relative 'import_spec_helper'
describe Import::GitoriousController do describe Import::GitoriousController do
include ImportSpecHelper
let(:user) { create(:user) } let(:user) { create(:user) }
before do before do
...@@ -30,7 +33,7 @@ describe Import::GitoriousController do ...@@ -30,7 +33,7 @@ describe Import::GitoriousController do
it "assigns variables" do it "assigns variables" do
@project = create(:project, import_type: 'gitorious', creator_id: user.id) @project = create(:project, import_type: 'gitorious', creator_id: user.id)
controller.stub_chain(:client, :repos).and_return([@repo]) stub_client(repos: [@repo])
get :status get :status
...@@ -40,7 +43,7 @@ describe Import::GitoriousController do ...@@ -40,7 +43,7 @@ describe Import::GitoriousController do
it "does not show already added project" do it "does not show already added project" do
@project = create(:project, import_type: 'gitorious', creator_id: user.id, import_source: 'asd/vim') @project = create(:project, import_type: 'gitorious', creator_id: user.id, import_source: 'asd/vim')
controller.stub_chain(:client, :repos).and_return([@repo]) stub_client(repos: [@repo])
get :status get :status
...@@ -59,7 +62,7 @@ describe Import::GitoriousController do ...@@ -59,7 +62,7 @@ describe Import::GitoriousController do
expect(Gitlab::GitoriousImport::ProjectCreator). expect(Gitlab::GitoriousImport::ProjectCreator).
to receive(:new).with(@repo, namespace, user). to receive(:new).with(@repo, namespace, user).
and_return(double(execute: true)) and_return(double(execute: true))
controller.stub_chain(:client, :repo).and_return(@repo) stub_client(repo: @repo)
post :create, format: :js post :create, format: :js
end end
......
require 'spec_helper' require 'spec_helper'
require_relative 'import_spec_helper'
describe Import::GoogleCodeController do describe Import::GoogleCodeController do
include ImportSpecHelper
let(:user) { create(:user) } let(:user) { create(:user) }
let(:dump_file) { fixture_file_upload(Rails.root + 'spec/fixtures/GoogleCodeProjectHosting.json', 'application/json') } let(:dump_file) { fixture_file_upload(Rails.root + 'spec/fixtures/GoogleCodeProjectHosting.json', 'application/json') }
...@@ -21,13 +24,12 @@ describe Import::GoogleCodeController do ...@@ -21,13 +24,12 @@ describe Import::GoogleCodeController do
describe "GET status" do describe "GET status" do
before do before do
@repo = OpenStruct.new(name: 'vim') @repo = OpenStruct.new(name: 'vim')
controller.stub_chain(:client, :valid?).and_return(true) stub_client(valid?: true)
end end
it "assigns variables" do it "assigns variables" do
@project = create(:project, import_type: 'google_code', creator_id: user.id) @project = create(:project, import_type: 'google_code', creator_id: user.id)
controller.stub_chain(:client, :repos).and_return([@repo]) stub_client(repos: [@repo], incompatible_repos: [])
controller.stub_chain(:client, :incompatible_repos).and_return([])
get :status get :status
...@@ -38,8 +40,7 @@ describe Import::GoogleCodeController do ...@@ -38,8 +40,7 @@ describe Import::GoogleCodeController do
it "does not show already added project" do it "does not show already added project" do
@project = create(:project, import_type: 'google_code', creator_id: user.id, import_source: 'vim') @project = create(:project, import_type: 'google_code', creator_id: user.id, import_source: 'vim')
controller.stub_chain(:client, :repos).and_return([@repo]) stub_client(repos: [@repo], incompatible_repos: [])
controller.stub_chain(:client, :incompatible_repos).and_return([])
get :status get :status
...@@ -48,8 +49,7 @@ describe Import::GoogleCodeController do ...@@ -48,8 +49,7 @@ describe Import::GoogleCodeController do
end end
it "does not show any invalid projects" do it "does not show any invalid projects" do
controller.stub_chain(:client, :repos).and_return([]) stub_client(repos: [], incompatible_repos: [@repo])
controller.stub_chain(:client, :incompatible_repos).and_return([@repo])
get :status get :status
......
require 'ostruct'
# Helper methods for controller specs in the Import namespace
#
# Must be included manually.
module ImportSpecHelper
# Stub `controller` to return a null object double with the provided messages
# when `client` is called
#
# Examples:
#
# stub_client(foo: %w(foo))
#
# controller.client.foo # => ["foo"]
# controller.client.bar.baz.foo # => ["foo"]
#
# Returns the client double
def stub_client(messages = {})
client = double('client', messages).as_null_object
allow(controller).to receive(:client).and_return(client)
client
end
def stub_omniauth_provider(name)
provider = OpenStruct.new(
name: name,
app_id: 'asd123',
app_secret: 'asd123'
)
Gitlab.config.omniauth.providers << provider
end
end
...@@ -52,10 +52,10 @@ describe Projects::MergeRequestsController do ...@@ -52,10 +52,10 @@ describe Projects::MergeRequestsController do
id: merge_request.iid, id: merge_request.iid,
format: format) format: format)
expect(response.body).to_not include('&amp;') expect(response.body).not_to include('&amp;')
expect(response.body).to_not include('&gt;') expect(response.body).not_to include('&gt;')
expect(response.body).to_not include('&lt;') expect(response.body).not_to include('&lt;')
expect(response.body).to_not include('&quot;') expect(response.body).not_to include('&quot;')
end end
end end
......
...@@ -11,7 +11,8 @@ describe "GitLab Flavored Markdown", feature: true do ...@@ -11,7 +11,8 @@ describe "GitLab Flavored Markdown", feature: true do
end end
before do before do
Commit.any_instance.stub(title: "fix #{issue.to_reference}\n\nask #{fred.to_reference} for details") allow_any_instance_of(Commit).to receive(:title).
and_return("fix #{issue.to_reference}\n\nask #{fred.to_reference} for details")
end end
let(:commit) { project.commit } let(:commit) { project.commit }
......
...@@ -9,7 +9,8 @@ describe 'Profile account page', feature: true do ...@@ -9,7 +9,8 @@ describe 'Profile account page', feature: true do
describe 'when signup is enabled' do describe 'when signup is enabled' do
before do before do
ApplicationSetting.any_instance.stub(signup_enabled?: true) allow_any_instance_of(ApplicationSetting).
to receive(:signup_enabled?).and_return(true)
visit profile_account_path visit profile_account_path
end end
...@@ -23,7 +24,8 @@ describe 'Profile account page', feature: true do ...@@ -23,7 +24,8 @@ describe 'Profile account page', feature: true do
describe 'when signup is disabled' do describe 'when signup is disabled' do
before do before do
ApplicationSetting.any_instance.stub(signup_enabled?: false) allow_any_instance_of(ApplicationSetting).
to receive(:signup_enabled?).and_return(false)
visit profile_account_path visit profile_account_path
end end
......
...@@ -75,7 +75,7 @@ describe 'Profile > Preferences' do ...@@ -75,7 +75,7 @@ describe 'Profile > Preferences' do
end end
def expect_preferences_saved_message def expect_preferences_saved_message
within('.flash-container') do page.within('.flash-container') do
expect(page).to have_content('Preferences saved.') expect(page).to have_content('Preferences saved.')
end end
end end
......
...@@ -6,7 +6,7 @@ describe "Profile access", feature: true do ...@@ -6,7 +6,7 @@ describe "Profile access", feature: true do
end end
describe "GET /login" do describe "GET /login" do
it { expect(new_user_session_path).not_to be_404_for :visitor } it { expect(new_user_session_path).not_to be_not_found_for :visitor }
end end
describe "GET /profile/keys" do describe "GET /profile/keys" do
......
...@@ -40,15 +40,15 @@ describe ApplicationHelper do ...@@ -40,15 +40,15 @@ describe ApplicationHelper do
end end
describe 'project_icon' do describe 'project_icon' do
avatar_file_path = File.join(Rails.root, 'public', 'gitlab_logo.png') avatar_file_path = File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif')
it 'should return an url for the avatar' do it 'should return an url for the avatar' do
project = create(:project) project = create(:project)
project.avatar = File.open(avatar_file_path) project.avatar = File.open(avatar_file_path)
project.save! project.save!
avatar_url = "http://localhost/uploads/project/avatar/#{ project.id }/gitlab_logo.png" avatar_url = "http://localhost/uploads/project/avatar/#{ project.id }/banana_sample.gif"
expect(project_icon("#{project.namespace.to_param}/#{project.to_param}").to_s).to eq( expect(project_icon("#{project.namespace.to_param}/#{project.to_param}").to_s).to eq(
"<img alt=\"Gitlab logo\" src=\"#{avatar_url}\" />" "<img alt=\"Banana sample\" src=\"#{avatar_url}\" />"
) )
end end
...@@ -65,25 +65,25 @@ describe ApplicationHelper do ...@@ -65,25 +65,25 @@ describe ApplicationHelper do
end end
describe 'avatar_icon' do describe 'avatar_icon' do
avatar_file_path = File.join(Rails.root, 'public', 'gitlab_logo.png') avatar_file_path = File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif')
it 'should return an url for the avatar' do it 'should return an url for the avatar' do
user = create(:user) user = create(:user)
user.avatar = File.open(avatar_file_path) user.avatar = File.open(avatar_file_path)
user.save! user.save!
expect(avatar_icon(user.email).to_s). expect(avatar_icon(user.email).to_s).
to match("/uploads/user/avatar/#{ user.id }/gitlab_logo.png") to match("/uploads/user/avatar/#{ user.id }/banana_sample.gif")
end end
it 'should return an url for the avatar with relative url' do it 'should return an url for the avatar with relative url' do
Gitlab.config.gitlab.stub(relative_url_root: '/gitlab') allow(Gitlab.config.gitlab).to receive(:relative_url_root).and_return('/gitlab')
Gitlab.config.gitlab.stub(url: Settings.send(:build_gitlab_url)) allow(Gitlab.config.gitlab).to receive(:url).and_return(Settings.send(:build_gitlab_url))
user = create(:user) user = create(:user)
user.avatar = File.open(avatar_file_path) user.avatar = File.open(avatar_file_path)
user.save! user.save!
expect(avatar_icon(user.email).to_s). expect(avatar_icon(user.email).to_s).
to match("/gitlab/uploads/user/avatar/#{ user.id }/gitlab_logo.png") to match("/gitlab/uploads/user/avatar/#{ user.id }/banana_sample.gif")
end end
it 'should call gravatar_icon when no avatar is present' do it 'should call gravatar_icon when no avatar is present' do
...@@ -97,7 +97,7 @@ describe ApplicationHelper do ...@@ -97,7 +97,7 @@ describe ApplicationHelper do
let(:user_email) { 'user@email.com' } let(:user_email) { 'user@email.com' }
it 'should return a generic avatar path when Gravatar is disabled' do it 'should return a generic avatar path when Gravatar is disabled' do
ApplicationSetting.any_instance.stub(gravatar_enabled?: false) allow_any_instance_of(ApplicationSetting).to receive(:gravatar_enabled?).and_return(false)
expect(gravatar_icon(user_email)).to match('no_avatar.png') expect(gravatar_icon(user_email)).to match('no_avatar.png')
end end
...@@ -106,13 +106,13 @@ describe ApplicationHelper do ...@@ -106,13 +106,13 @@ describe ApplicationHelper do
end end
it 'should return default gravatar url' do it 'should return default gravatar url' do
Gitlab.config.gitlab.stub(https: false) allow(Gitlab.config.gitlab).to receive(:https).and_return(false)
url = 'http://www.gravatar.com/avatar/b58c6f14d292556214bd64909bcdb118' url = 'http://www.gravatar.com/avatar/b58c6f14d292556214bd64909bcdb118'
expect(gravatar_icon(user_email)).to match(url) expect(gravatar_icon(user_email)).to match(url)
end end
it 'should use SSL when appropriate' do it 'should use SSL when appropriate' do
Gitlab.config.gitlab.stub(https: true) allow(Gitlab.config.gitlab).to receive(:https).and_return(true)
expect(gravatar_icon(user_email)).to match('https://secure.gravatar.com') expect(gravatar_icon(user_email)).to match('https://secure.gravatar.com')
end end
......
...@@ -2,20 +2,20 @@ require 'spec_helper' ...@@ -2,20 +2,20 @@ require 'spec_helper'
describe BroadcastMessagesHelper do describe BroadcastMessagesHelper do
describe 'broadcast_styling' do describe 'broadcast_styling' do
let(:broadcast_message) { double(color: "", font: "") } let(:broadcast_message) { double(color: '', font: '') }
context "default style" do context "default style" do
it "should have no style" do it "should have no style" do
expect(broadcast_styling(broadcast_message)).to match('') expect(broadcast_styling(broadcast_message)).to eq ''
end end
end end
context "customiezd style" do context "customized style" do
before { broadcast_message.stub(color: "#f2dede", font: "#b94a48") } let(:broadcast_message) { double(color: "#f2dede", font: '#b94a48') }
it "should have a customized style" do it "should have a customized style" do
expect(broadcast_styling(broadcast_message)). expect(broadcast_styling(broadcast_message)).
to match('background-color:#f2dede;color:#b94a48') to match('background-color: #f2dede; color: #b94a48')
end end
end end
end end
......
...@@ -48,19 +48,19 @@ describe DiffHelper do ...@@ -48,19 +48,19 @@ describe DiffHelper do
end end
it 'should return only the first file if the diff line count in the 2nd file takes the total beyond safe limits' do it 'should return only the first file if the diff line count in the 2nd file takes the total beyond safe limits' do
diffs[1].diff.stub(lines: [""] * 4999) #simulate 4999 lines allow(diffs[1].diff).to receive(:lines).and_return([""] * 4999) #simulate 4999 lines
expect(safe_diff_files(diffs).length).to eq(1) expect(safe_diff_files(diffs).length).to eq(1)
end end
it 'should return all files from a commit that is beyond safe limit for numbers of lines if force diff is true' do it 'should return all files from a commit that is beyond safe limit for numbers of lines if force diff is true' do
allow(controller).to receive(:params) { { force_show_diff: true } } allow(controller).to receive(:params) { { force_show_diff: true } }
diffs[1].diff.stub(lines: [""] * 4999) #simulate 4999 lines allow(diffs[1].diff).to receive(:lines).and_return([""] * 4999) #simulate 4999 lines
expect(safe_diff_files(diffs).length).to eq(2) expect(safe_diff_files(diffs).length).to eq(2)
end end
it 'should return only the first file if the diff line count in the 2nd file takes the total beyond hard limits' do it 'should return only the first file if the diff line count in the 2nd file takes the total beyond hard limits' do
allow(controller).to receive(:params) { { force_show_diff: true } } allow(controller).to receive(:params) { { force_show_diff: true } }
diffs[1].diff.stub(lines: [""] * 49999) #simulate 49999 lines allow(diffs[1].diff).to receive(:lines).and_return([""] * 49999) #simulate 49999 lines
expect(safe_diff_files(diffs).length).to eq(1) expect(safe_diff_files(diffs).length).to eq(1)
end end
......
...@@ -2,14 +2,14 @@ require 'spec_helper' ...@@ -2,14 +2,14 @@ require 'spec_helper'
describe GroupsHelper do describe GroupsHelper do
describe 'group_icon' do describe 'group_icon' do
avatar_file_path = File.join(Rails.root, 'public', 'gitlab_logo.png') avatar_file_path = File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif')
it 'should return an url for the avatar' do it 'should return an url for the avatar' do
group = create(:group) group = create(:group)
group.avatar = File.open(avatar_file_path) group.avatar = File.open(avatar_file_path)
group.save! group.save!
expect(group_icon(group.path).to_s). expect(group_icon(group.path).to_s).
to match("/uploads/group/avatar/#{ group.id }/gitlab_logo.png") to match("/uploads/group/avatar/#{ group.id }/banana_sample.gif")
end end
it 'should give default avatar_icon when no avatar is present' do it 'should give default avatar_icon when no avatar is present' do
......
require 'spec_helper' require 'spec_helper'
describe NotificationsHelper do describe NotificationsHelper do
include FontAwesome::Rails::IconHelper
include IconsHelper
describe 'notification_icon' do describe 'notification_icon' do
let(:notification) { double(disabled?: false, participating?: false, watch?: false) } let(:notification) { double(disabled?: false, participating?: false, watch?: false) }
context "disabled notification" do context "disabled notification" do
before { notification.stub(disabled?: true) } before { allow(notification).to receive(:disabled?).and_return(true) }
it "has a red icon" do it "has a red icon" do
expect(notification_icon(notification)).to match('class="fa fa-volume-off ns-mute"') expect(notification_icon(notification)).to match('class="fa fa-volume-off ns-mute"')
...@@ -16,7 +13,7 @@ describe NotificationsHelper do ...@@ -16,7 +13,7 @@ describe NotificationsHelper do
end end
context "participating notification" do context "participating notification" do
before { notification.stub(participating?: true) } before { allow(notification).to receive(:participating?).and_return(true) }
it "has a blue icon" do it "has a blue icon" do
expect(notification_icon(notification)).to match('class="fa fa-volume-down ns-part"') expect(notification_icon(notification)).to match('class="fa fa-volume-down ns-part"')
...@@ -24,7 +21,7 @@ describe NotificationsHelper do ...@@ -24,7 +21,7 @@ describe NotificationsHelper do
end end
context "watched notification" do context "watched notification" do
before { notification.stub(watch?: true) } before { allow(notification).to receive(:watch?).and_return(true) }
it "has a green icon" do it "has a green icon" do
expect(notification_icon(notification)).to match('class="fa fa-volume-up ns-watch"') expect(notification_icon(notification)).to match('class="fa fa-volume-up ns-watch"')
......
...@@ -14,41 +14,41 @@ describe SubmoduleHelper do ...@@ -14,41 +14,41 @@ describe SubmoduleHelper do
context 'submodule on self' do context 'submodule on self' do
before do before do
Gitlab.config.gitlab.stub(protocol: 'http') # set this just to be sure allow(Gitlab.config.gitlab).to receive(:protocol).and_return('http') # set this just to be sure
end end
it 'should detect ssh on standard port' do it 'should detect ssh on standard port' do
Gitlab.config.gitlab_shell.stub(ssh_port: 22) # set this just to be sure allow(Gitlab.config.gitlab_shell).to receive(:ssh_port).and_return(22) # set this just to be sure
Gitlab.config.gitlab_shell.stub(ssh_path_prefix: Settings.send(:build_gitlab_shell_ssh_path_prefix)) allow(Gitlab.config.gitlab_shell).to receive(:ssh_path_prefix).and_return(Settings.send(:build_gitlab_shell_ssh_path_prefix))
stub_url([ config.user, '@', config.host, ':gitlab-org/gitlab-ce.git' ].join('')) stub_url([ config.user, '@', config.host, ':gitlab-org/gitlab-ce.git' ].join(''))
expect(submodule_links(submodule_item)).to eq([ namespace_project_path('gitlab-org', 'gitlab-ce'), namespace_project_tree_path('gitlab-org', 'gitlab-ce', 'hash') ]) expect(submodule_links(submodule_item)).to eq([ namespace_project_path('gitlab-org', 'gitlab-ce'), namespace_project_tree_path('gitlab-org', 'gitlab-ce', 'hash') ])
end end
it 'should detect ssh on non-standard port' do it 'should detect ssh on non-standard port' do
Gitlab.config.gitlab_shell.stub(ssh_port: 2222) allow(Gitlab.config.gitlab_shell).to receive(:ssh_port).and_return(2222)
Gitlab.config.gitlab_shell.stub(ssh_path_prefix: Settings.send(:build_gitlab_shell_ssh_path_prefix)) allow(Gitlab.config.gitlab_shell).to receive(:ssh_path_prefix).and_return(Settings.send(:build_gitlab_shell_ssh_path_prefix))
stub_url([ 'ssh://', config.user, '@', config.host, ':2222/gitlab-org/gitlab-ce.git' ].join('')) stub_url([ 'ssh://', config.user, '@', config.host, ':2222/gitlab-org/gitlab-ce.git' ].join(''))
expect(submodule_links(submodule_item)).to eq([ namespace_project_path('gitlab-org', 'gitlab-ce'), namespace_project_tree_path('gitlab-org', 'gitlab-ce', 'hash') ]) expect(submodule_links(submodule_item)).to eq([ namespace_project_path('gitlab-org', 'gitlab-ce'), namespace_project_tree_path('gitlab-org', 'gitlab-ce', 'hash') ])
end end
it 'should detect http on standard port' do it 'should detect http on standard port' do
Gitlab.config.gitlab.stub(port: 80) allow(Gitlab.config.gitlab).to receive(:port).and_return(80)
Gitlab.config.gitlab.stub(url: Settings.send(:build_gitlab_url)) allow(Gitlab.config.gitlab).to receive(:url).and_return(Settings.send(:build_gitlab_url))
stub_url([ 'http://', config.host, '/gitlab-org/gitlab-ce.git' ].join('')) stub_url([ 'http://', config.host, '/gitlab-org/gitlab-ce.git' ].join(''))
expect(submodule_links(submodule_item)).to eq([ namespace_project_path('gitlab-org', 'gitlab-ce'), namespace_project_tree_path('gitlab-org', 'gitlab-ce', 'hash') ]) expect(submodule_links(submodule_item)).to eq([ namespace_project_path('gitlab-org', 'gitlab-ce'), namespace_project_tree_path('gitlab-org', 'gitlab-ce', 'hash') ])
end end
it 'should detect http on non-standard port' do it 'should detect http on non-standard port' do
Gitlab.config.gitlab.stub(port: 3000) allow(Gitlab.config.gitlab).to receive(:port).and_return(3000)
Gitlab.config.gitlab.stub(url: Settings.send(:build_gitlab_url)) allow(Gitlab.config.gitlab).to receive(:url).and_return(Settings.send(:build_gitlab_url))
stub_url([ 'http://', config.host, ':3000/gitlab-org/gitlab-ce.git' ].join('')) stub_url([ 'http://', config.host, ':3000/gitlab-org/gitlab-ce.git' ].join(''))
expect(submodule_links(submodule_item)).to eq([ namespace_project_path('gitlab-org', 'gitlab-ce'), namespace_project_tree_path('gitlab-org', 'gitlab-ce', 'hash') ]) expect(submodule_links(submodule_item)).to eq([ namespace_project_path('gitlab-org', 'gitlab-ce'), namespace_project_tree_path('gitlab-org', 'gitlab-ce', 'hash') ])
end end
it 'should work with relative_url_root' do it 'should work with relative_url_root' do
Gitlab.config.gitlab.stub(port: 80) # set this just to be sure allow(Gitlab.config.gitlab).to receive(:port).and_return(80) # set this just to be sure
Gitlab.config.gitlab.stub(relative_url_root: '/gitlab/root') allow(Gitlab.config.gitlab).to receive(:relative_url_root).and_return('/gitlab/root')
Gitlab.config.gitlab.stub(url: Settings.send(:build_gitlab_url)) allow(Gitlab.config.gitlab).to receive(:url).and_return(Settings.send(:build_gitlab_url))
stub_url([ 'http://', config.host, '/gitlab/root/gitlab-org/gitlab-ce.git' ].join('')) stub_url([ 'http://', config.host, '/gitlab/root/gitlab-org/gitlab-ce.git' ].join(''))
expect(submodule_links(submodule_item)).to eq([ namespace_project_path('gitlab-org', 'gitlab-ce'), namespace_project_tree_path('gitlab-org', 'gitlab-ce', 'hash') ]) expect(submodule_links(submodule_item)).to eq([ namespace_project_path('gitlab-org', 'gitlab-ce'), namespace_project_tree_path('gitlab-org', 'gitlab-ce', 'hash') ])
end end
...@@ -156,6 +156,6 @@ describe SubmoduleHelper do ...@@ -156,6 +156,6 @@ describe SubmoduleHelper do
end end
def stub_url(url) def stub_url(url)
repo.stub(submodule_url_for: url) allow(repo).to receive(:submodule_url_for).and_return(url)
end end
end end
...@@ -9,8 +9,11 @@ describe ExtractsPath do ...@@ -9,8 +9,11 @@ describe ExtractsPath do
before do before do
@project = project @project = project
project.stub(repository: double(ref_names: ['master', 'foo/bar/baz', 'v1.0.0', 'v2.0.0']))
project.stub(path_with_namespace: 'gitlab/gitlab-ci') repo = double(ref_names: ['master', 'foo/bar/baz', 'v1.0.0', 'v2.0.0'])
allow(project).to receive(:repository).and_return(repo)
allow(project).to receive(:path_with_namespace).
and_return('gitlab/gitlab-ci')
end end
describe '#assign_ref' do describe '#assign_ref' do
......
...@@ -27,16 +27,18 @@ describe Gitlab::Auth do ...@@ -27,16 +27,18 @@ describe Gitlab::Auth do
it "should not find user with invalid password" do it "should not find user with invalid password" do
password = 'wrong' password = 'wrong'
expect( gl_auth.find(username, password) ).to_not eql user expect( gl_auth.find(username, password) ).not_to eql user
end end
it "should not find user with invalid login" do it "should not find user with invalid login" do
user = 'wrong' user = 'wrong'
expect( gl_auth.find(username, password) ).to_not eql user expect( gl_auth.find(username, password) ).not_to eql user
end end
context "with ldap enabled" do context "with ldap enabled" do
before { Gitlab::LDAP::Config.stub(enabled?: true) } before do
allow(Gitlab::LDAP::Config).to receive(:enabled?).and_return(true)
end
it "tries to autheticate with db before ldap" do it "tries to autheticate with db before ldap" do
expect(Gitlab::LDAP::Authentication).not_to receive(:login) expect(Gitlab::LDAP::Authentication).not_to receive(:login)
......
...@@ -5,7 +5,7 @@ describe Gitlab::Shell do ...@@ -5,7 +5,7 @@ describe Gitlab::Shell do
let(:gitlab_shell) { Gitlab::Shell.new } let(:gitlab_shell) { Gitlab::Shell.new }
before do before do
Project.stub(find: project) allow(Project).to receive(:find).and_return(project)
end end
it { is_expected.to respond_to :add_key } it { is_expected.to respond_to :add_key }
......
...@@ -15,7 +15,7 @@ describe Gitlab::GoogleCodeImport::Client do ...@@ -15,7 +15,7 @@ describe Gitlab::GoogleCodeImport::Client do
let(:raw_data) { "No clue" } let(:raw_data) { "No clue" }
it "returns true" do it "returns true" do
expect(subject).to_not be_valid expect(subject).not_to be_valid
end end
end end
end end
......
...@@ -24,7 +24,7 @@ describe Gitlab::GoogleCodeImport::Importer do ...@@ -24,7 +24,7 @@ describe Gitlab::GoogleCodeImport::Importer do
subject.execute subject.execute
%w(New NeedInfo Accepted Wishlist Started Fixed Invalid Duplicate WontFix Incomplete).each do |status| %w(New NeedInfo Accepted Wishlist Started Fixed Invalid Duplicate WontFix Incomplete).each do |status|
expect(project.labels.find_by(name: "Status: #{status}")).to_not be_nil expect(project.labels.find_by(name: "Status: #{status}")).not_to be_nil
end end
end end
...@@ -38,7 +38,7 @@ describe Gitlab::GoogleCodeImport::Importer do ...@@ -38,7 +38,7 @@ describe Gitlab::GoogleCodeImport::Importer do
Component-Systray Component-Clock Component-Launcher Component-Tint2conf Component-Docs Component-New Component-Systray Component-Clock Component-Launcher Component-Tint2conf Component-Docs Component-New
).each do |label| ).each do |label|
label.sub!("-", ": ") label.sub!("-", ": ")
expect(project.labels.find_by(name: label)).to_not be_nil expect(project.labels.find_by(name: label)).not_to be_nil
end end
end end
...@@ -46,7 +46,7 @@ describe Gitlab::GoogleCodeImport::Importer do ...@@ -46,7 +46,7 @@ describe Gitlab::GoogleCodeImport::Importer do
subject.execute subject.execute
issue = project.issues.first issue = project.issues.first
expect(issue).to_not be_nil expect(issue).not_to be_nil
expect(issue.iid).to eq(169) expect(issue.iid).to eq(169)
expect(issue.author).to eq(project.creator) expect(issue.author).to eq(project.creator)
expect(issue.assignee).to eq(mapped_user) expect(issue.assignee).to eq(mapped_user)
...@@ -71,7 +71,7 @@ describe Gitlab::GoogleCodeImport::Importer do ...@@ -71,7 +71,7 @@ describe Gitlab::GoogleCodeImport::Importer do
subject.execute subject.execute
note = project.issues.first.notes.first note = project.issues.first.notes.first
expect(note).to_not be_nil expect(note).not_to be_nil
expect(note.note).to include("Comment 1") expect(note.note).to include("Comment 1")
expect(note.note).to include("@#{mapped_user.username}") expect(note.note).to include("@#{mapped_user.username}")
expect(note.note).to include("November 18, 2009 05:14") expect(note.note).to include("November 18, 2009 05:14")
......
...@@ -8,16 +8,24 @@ describe Gitlab::LDAP::Access do ...@@ -8,16 +8,24 @@ describe Gitlab::LDAP::Access do
subject { access.allowed? } subject { access.allowed? }
context 'when the user cannot be found' do context 'when the user cannot be found' do
before { Gitlab::LDAP::Person.stub(find_by_dn: nil) } before do
allow(Gitlab::LDAP::Person).to receive(:find_by_dn).and_return(nil)
end
it { is_expected.to be_falsey } it { is_expected.to be_falsey }
end end
context 'when the user is found' do context 'when the user is found' do
before { Gitlab::LDAP::Person.stub(find_by_dn: :ldap_user) } before do
allow(Gitlab::LDAP::Person).
to receive(:find_by_dn).and_return(:ldap_user)
end
context 'and the user is disabled via active directory' do context 'and the user is disabled via active directory' do
before { Gitlab::LDAP::Person.stub(disabled_via_active_directory?: true) } before do
allow(Gitlab::LDAP::Person).
to receive(:disabled_via_active_directory?).and_return(true)
end
it { is_expected.to be_falsey } it { is_expected.to be_falsey }
...@@ -30,8 +38,9 @@ describe Gitlab::LDAP::Access do ...@@ -30,8 +38,9 @@ describe Gitlab::LDAP::Access do
context 'and has no disabled flag in active diretory' do context 'and has no disabled flag in active diretory' do
before do before do
user.block user.block
Gitlab::LDAP::Person.stub(disabled_via_active_directory?: false) allow(Gitlab::LDAP::Person).
to receive(:disabled_via_active_directory?).and_return(false)
end end
it { is_expected.to be_truthy } it { is_expected.to be_truthy }
...@@ -39,7 +48,8 @@ describe Gitlab::LDAP::Access do ...@@ -39,7 +48,8 @@ describe Gitlab::LDAP::Access do
context 'when auto-created users are blocked' do context 'when auto-created users are blocked' do
before do before do
Gitlab::LDAP::Config.any_instance.stub(block_auto_created_users: true) allow_any_instance_of(Gitlab::LDAP::Config).
to receive(:block_auto_created_users).and_return(true)
end end
it "does not unblock user in GitLab" do it "does not unblock user in GitLab" do
...@@ -51,7 +61,8 @@ describe Gitlab::LDAP::Access do ...@@ -51,7 +61,8 @@ describe Gitlab::LDAP::Access do
context "when auto-created users are not blocked" do context "when auto-created users are not blocked" do
before do before do
Gitlab::LDAP::Config.any_instance.stub(block_auto_created_users: false) allow_any_instance_of(Gitlab::LDAP::Config).
to receive(:block_auto_created_users).and_return(false)
end end
it "should unblock user in GitLab" do it "should unblock user in GitLab" do
...@@ -63,8 +74,9 @@ describe Gitlab::LDAP::Access do ...@@ -63,8 +74,9 @@ describe Gitlab::LDAP::Access do
context 'without ActiveDirectory enabled' do context 'without ActiveDirectory enabled' do
before do before do
Gitlab::LDAP::Config.stub(enabled?: true) allow(Gitlab::LDAP::Config).to receive(:enabled?).and_return(true)
Gitlab::LDAP::Config.any_instance.stub(active_directory: false) allow_any_instance_of(Gitlab::LDAP::Config).
to receive(:active_directory).and_return(false)
end end
it { is_expected.to be_truthy } it { is_expected.to be_truthy }
......
...@@ -3,27 +3,32 @@ require 'spec_helper' ...@@ -3,27 +3,32 @@ require 'spec_helper'
describe Gitlab::LDAP::Adapter do describe Gitlab::LDAP::Adapter do
let(:adapter) { Gitlab::LDAP::Adapter.new 'ldapmain' } let(:adapter) { Gitlab::LDAP::Adapter.new 'ldapmain' }
describe :dn_matches_filter? do describe '#dn_matches_filter?' do
let(:ldap) { double(:ldap) } let(:ldap) { double(:ldap) }
subject { adapter.dn_matches_filter?(:dn, :filter) } subject { adapter.dn_matches_filter?(:dn, :filter) }
before { adapter.stub(ldap: ldap) } before { allow(adapter).to receive(:ldap).and_return(ldap) }
context "when the search is successful" do context "when the search is successful" do
context "and the result is non-empty" do context "and the result is non-empty" do
before { ldap.stub(search: [:foo]) } before { allow(ldap).to receive(:search).and_return([:foo]) }
it { is_expected.to be_truthy } it { is_expected.to be_truthy }
end end
context "and the result is empty" do context "and the result is empty" do
before { ldap.stub(search: []) } before { allow(ldap).to receive(:search).and_return([]) }
it { is_expected.to be_falsey } it { is_expected.to be_falsey }
end end
end end
context "when the search encounters an error" do context "when the search encounters an error" do
before { ldap.stub(search: nil, get_operation_result: double(code: 1, message: 'some error')) } before do
allow(ldap).to receive_messages(
search: nil,
get_operation_result: double(code: 1, message: 'some error')
)
end
it { is_expected.to be_falsey } it { is_expected.to be_falsey }
end end
......
require 'spec_helper' require 'spec_helper'
describe Gitlab::LDAP::Authentication do describe Gitlab::LDAP::Authentication do
let(:klass) { Gitlab::LDAP::Authentication } let(:user) { create(:omniauth_user, extern_uid: dn) }
let(:user) { create(:omniauth_user, extern_uid: dn) } let(:dn) { 'uid=john,ou=people,dc=example,dc=com' }
let(:dn) { 'uid=john,ou=people,dc=example,dc=com' } let(:login) { 'john' }
let(:login) { 'john' }
let(:password) { 'password' } let(:password) { 'password' }
describe :login do describe 'login' do
let(:adapter) { double :adapter }
before do before do
Gitlab::LDAP::Config.stub(enabled?: true) allow(Gitlab::LDAP::Config).to receive(:enabled?).and_return(true)
end end
it "finds the user if authentication is successful" do it "finds the user if authentication is successful" do
user expect(user).not_to be_nil
# try only to fake the LDAP call # try only to fake the LDAP call
klass.any_instance.stub(adapter: double(:adapter, adapter = double('adapter', dn: dn).as_null_object
bind_as: double(:ldap_user, dn: dn) allow_any_instance_of(described_class).
)) to receive(:adapter).and_return(adapter)
expect(klass.login(login, password)).to be_truthy
expect(described_class.login(login, password)).to be_truthy
end end
it "is false if the user does not exist" do it "is false if the user does not exist" do
# try only to fake the LDAP call # try only to fake the LDAP call
klass.any_instance.stub(adapter: double(:adapter, adapter = double('adapter', dn: dn).as_null_object
bind_as: double(:ldap_user, dn: dn) allow_any_instance_of(described_class).
)) to receive(:adapter).and_return(adapter)
expect(klass.login(login, password)).to be_falsey
expect(described_class.login(login, password)).to be_falsey
end end
it "is false if authentication fails" do it "is false if authentication fails" do
user expect(user).not_to be_nil
# try only to fake the LDAP call # try only to fake the LDAP call
klass.any_instance.stub(adapter: double(:adapter, bind_as: nil)) adapter = double('adapter', bind_as: nil).as_null_object
expect(klass.login(login, password)).to be_falsey allow_any_instance_of(described_class).
to receive(:adapter).and_return(adapter)
expect(described_class.login(login, password)).to be_falsey
end end
it "fails if ldap is disabled" do it "fails if ldap is disabled" do
Gitlab::LDAP::Config.stub(enabled?: false) allow(Gitlab::LDAP::Config).to receive(:enabled?).and_return(false)
expect(klass.login(login, password)).to be_falsey expect(described_class.login(login, password)).to be_falsey
end end
it "fails if no login is supplied" do it "fails if no login is supplied" do
expect(klass.login('', password)).to be_falsey expect(described_class.login('', password)).to be_falsey
end end
it "fails if no password is supplied" do it "fails if no password is supplied" do
expect(klass.login(login, '')).to be_falsey expect(described_class.login(login, '')).to be_falsey
end end
end end
end end
...@@ -14,7 +14,7 @@ describe Gitlab::LDAP::Config do ...@@ -14,7 +14,7 @@ describe Gitlab::LDAP::Config do
end end
it "raises an error if a unknow provider is used" do it "raises an error if a unknow provider is used" do
expect{ Gitlab::LDAP::Config.new 'unknown' }.to raise_error expect{ Gitlab::LDAP::Config.new 'unknown' }.to raise_error(RuntimeError)
end end
end end
end end
...@@ -16,31 +16,31 @@ describe Gitlab::LDAP::User do ...@@ -16,31 +16,31 @@ describe Gitlab::LDAP::User do
describe :changed? do describe :changed? do
it "marks existing ldap user as changed" do it "marks existing ldap user as changed" do
existing_user = create(:omniauth_user, extern_uid: 'my-uid', provider: 'ldapmain') create(:omniauth_user, extern_uid: 'my-uid', provider: 'ldapmain')
expect(ldap_user.changed?).to be_truthy expect(ldap_user.changed?).to be_truthy
end end
it "marks existing non-ldap user if the email matches as changed" do it "marks existing non-ldap user if the email matches as changed" do
existing_user = create(:user, email: 'john@example.com') create(:user, email: 'john@example.com')
expect(ldap_user.changed?).to be_truthy expect(ldap_user.changed?).to be_truthy
end end
it "dont marks existing ldap user as changed" do it "dont marks existing ldap user as changed" do
existing_user = create(:omniauth_user, email: 'john@example.com', extern_uid: 'my-uid', provider: 'ldapmain') create(:omniauth_user, email: 'john@example.com', extern_uid: 'my-uid', provider: 'ldapmain')
expect(ldap_user.changed?).to be_falsey expect(ldap_user.changed?).to be_falsey
end end
end end
describe :find_or_create do describe :find_or_create do
it "finds the user if already existing" do it "finds the user if already existing" do
existing_user = create(:omniauth_user, extern_uid: 'my-uid', provider: 'ldapmain') create(:omniauth_user, extern_uid: 'my-uid', provider: 'ldapmain')
expect{ ldap_user.save }.to_not change{ User.count } expect{ ldap_user.save }.not_to change{ User.count }
end end
it "connects to existing non-ldap user if the email matches" do it "connects to existing non-ldap user if the email matches" do
existing_user = create(:omniauth_user, email: 'john@example.com', provider: "twitter") existing_user = create(:omniauth_user, email: 'john@example.com', provider: "twitter")
expect{ ldap_user.save }.to_not change{ User.count } expect{ ldap_user.save }.not_to change{ User.count }
existing_user.reload existing_user.reload
expect(existing_user.ldap_identity.extern_uid).to eql 'my-uid' expect(existing_user.ldap_identity.extern_uid).to eql 'my-uid'
...@@ -52,11 +52,15 @@ describe Gitlab::LDAP::User do ...@@ -52,11 +52,15 @@ describe Gitlab::LDAP::User do
end end
end end
describe 'blocking' do describe 'blocking' do
def configure_block(value)
allow_any_instance_of(Gitlab::LDAP::Config).
to receive(:block_auto_created_users).and_return(value)
end
context 'signup' do context 'signup' do
context 'dont block on create' do context 'dont block on create' do
before { Gitlab::LDAP::Config.any_instance.stub block_auto_created_users: false } before { configure_block(false) }
it do it do
ldap_user.save ldap_user.save
...@@ -66,7 +70,7 @@ describe Gitlab::LDAP::User do ...@@ -66,7 +70,7 @@ describe Gitlab::LDAP::User do
end end
context 'block on create' do context 'block on create' do
before { Gitlab::LDAP::Config.any_instance.stub block_auto_created_users: true } before { configure_block(true) }
it do it do
ldap_user.save ldap_user.save
...@@ -83,7 +87,7 @@ describe Gitlab::LDAP::User do ...@@ -83,7 +87,7 @@ describe Gitlab::LDAP::User do
end end
context 'dont block on create' do context 'dont block on create' do
before { Gitlab::LDAP::Config.any_instance.stub block_auto_created_users: false } before { configure_block(false) }
it do it do
ldap_user.save ldap_user.save
...@@ -93,7 +97,7 @@ describe Gitlab::LDAP::User do ...@@ -93,7 +97,7 @@ describe Gitlab::LDAP::User do
end end
context 'block on create' do context 'block on create' do
before { Gitlab::LDAP::Config.any_instance.stub block_auto_created_users: true } before { configure_block(true) }
it do it do
ldap_user.save ldap_user.save
......
...@@ -51,7 +51,7 @@ describe Gitlab::OAuth::AuthHash do ...@@ -51,7 +51,7 @@ describe Gitlab::OAuth::AuthHash do
it { expect(auth_hash.email).to eql email_utf8 } it { expect(auth_hash.email).to eql email_utf8 }
it { expect(auth_hash.username).to eql nickname_utf8 } it { expect(auth_hash.username).to eql nickname_utf8 }
it { expect(auth_hash.name).to eql name_utf8 } it { expect(auth_hash.name).to eql name_utf8 }
it { expect(auth_hash.password).to_not be_empty } it { expect(auth_hash.password).not_to be_empty }
end end
context 'email not provided' do context 'email not provided' do
......
...@@ -19,23 +19,34 @@ describe Gitlab::OAuth::User do ...@@ -19,23 +19,34 @@ describe Gitlab::OAuth::User do
let!(:existing_user) { create(:omniauth_user, extern_uid: 'my-uid', provider: 'my-provider') } let!(:existing_user) { create(:omniauth_user, extern_uid: 'my-uid', provider: 'my-provider') }
it "finds an existing user based on uid and provider (facebook)" do it "finds an existing user based on uid and provider (facebook)" do
# FIXME (rspeicher): It's unlikely that this test is actually doing anything
# `auth` is never used and removing it entirely doesn't break the test, so
# what's it doing?
auth = double(info: double(name: 'John'), uid: 'my-uid', provider: 'my-provider') auth = double(info: double(name: 'John'), uid: 'my-uid', provider: 'my-provider')
expect( oauth_user.persisted? ).to be_truthy expect( oauth_user.persisted? ).to be_truthy
end end
it "returns false if use is not found in database" do it "returns false if use is not found in database" do
auth_hash.stub(uid: 'non-existing') allow(auth_hash).to receive(:uid).and_return('non-existing')
expect( oauth_user.persisted? ).to be_falsey expect( oauth_user.persisted? ).to be_falsey
end end
end end
describe :save do describe :save do
def stub_omniauth_config(messages)
allow(Gitlab.config.omniauth).to receive_messages(messages)
end
def stub_ldap_config(messages)
allow(Gitlab::LDAP::Config).to receive_messages(messages)
end
let(:provider) { 'twitter' } let(:provider) { 'twitter' }
describe 'signup' do describe 'signup' do
shared_examples "to verify compliance with allow_single_sign_on" do shared_examples "to verify compliance with allow_single_sign_on" do
context "with allow_single_sign_on enabled" do context "with allow_single_sign_on enabled" do
before { Gitlab.config.omniauth.stub allow_single_sign_on: true } before { stub_omniauth_config(allow_single_sign_on: true) }
it "creates a user from Omniauth" do it "creates a user from Omniauth" do
oauth_user.save oauth_user.save
...@@ -48,7 +59,7 @@ describe Gitlab::OAuth::User do ...@@ -48,7 +59,7 @@ describe Gitlab::OAuth::User do
end end
context "with allow_single_sign_on disabled (Default)" do context "with allow_single_sign_on disabled (Default)" do
before { Gitlab.config.omniauth.stub allow_single_sign_on: false } before { stub_omniauth_config(allow_single_sign_on: false) }
it "throws an error" do it "throws an error" do
expect{ oauth_user.save }.to raise_error StandardError expect{ oauth_user.save }.to raise_error StandardError
end end
...@@ -56,36 +67,36 @@ describe Gitlab::OAuth::User do ...@@ -56,36 +67,36 @@ describe Gitlab::OAuth::User do
end end
context "with auto_link_ldap_user disabled (default)" do context "with auto_link_ldap_user disabled (default)" do
before { Gitlab.config.omniauth.stub auto_link_ldap_user: false } before { stub_omniauth_config(auto_link_ldap_user: false) }
include_examples "to verify compliance with allow_single_sign_on" include_examples "to verify compliance with allow_single_sign_on"
end end
context "with auto_link_ldap_user enabled" do context "with auto_link_ldap_user enabled" do
before { Gitlab.config.omniauth.stub auto_link_ldap_user: true } before { stub_omniauth_config(auto_link_ldap_user: true) }
context "and no LDAP provider defined" do context "and no LDAP provider defined" do
before { allow(Gitlab::LDAP::Config).to receive(:providers).and_return([]) } before { stub_ldap_config(providers: []) }
include_examples "to verify compliance with allow_single_sign_on" include_examples "to verify compliance with allow_single_sign_on"
end end
context "and at least one LDAP provider is defined" do context "and at least one LDAP provider is defined" do
before { allow(Gitlab::LDAP::Config).to receive(:providers).and_return(['ldapmain']) } before { stub_ldap_config(providers: %w(ldapmain)) }
context "and a corresponding LDAP person" do context "and a corresponding LDAP person" do
before do before do
ldap_user.stub(:uid) { uid } allow(ldap_user).to receive(:uid) { uid }
ldap_user.stub(:username) { uid } allow(ldap_user).to receive(:username) { uid }
ldap_user.stub(:email) { ['johndoe@example.com','john2@example.com'] } allow(ldap_user).to receive(:email) { ['johndoe@example.com','john2@example.com'] }
ldap_user.stub(:dn) { 'uid=user1,ou=People,dc=example' } allow(ldap_user).to receive(:dn) { 'uid=user1,ou=People,dc=example' }
allow(Gitlab::LDAP::Person).to receive(:find_by_uid).and_return(ldap_user) allow(Gitlab::LDAP::Person).to receive(:find_by_uid).and_return(ldap_user)
end end
context "and no account for the LDAP user" do context "and no account for the LDAP user" do
it "creates a user with dual LDAP and omniauth identities" do it "creates a user with dual LDAP and omniauth identities" do
oauth_user.save oauth_user.save
expect(gl_user).to be_valid expect(gl_user).to be_valid
expect(gl_user.username).to eql uid expect(gl_user.username).to eql uid
expect(gl_user.email).to eql 'johndoe@example.com' expect(gl_user.email).to eql 'johndoe@example.com'
...@@ -97,12 +108,12 @@ describe Gitlab::OAuth::User do ...@@ -97,12 +108,12 @@ describe Gitlab::OAuth::User do
]) ])
end end
end end
context "and LDAP user has an account already" do context "and LDAP user has an account already" do
let!(:existing_user) { create(:omniauth_user, email: 'john@example.com', extern_uid: 'uid=user1,ou=People,dc=example', provider: 'ldapmain', username: 'john') } let!(:existing_user) { create(:omniauth_user, email: 'john@example.com', extern_uid: 'uid=user1,ou=People,dc=example', provider: 'ldapmain', username: 'john') }
it "adds the omniauth identity to the LDAP account" do it "adds the omniauth identity to the LDAP account" do
oauth_user.save oauth_user.save
expect(gl_user).to be_valid expect(gl_user).to be_valid
expect(gl_user.username).to eql 'john' expect(gl_user.username).to eql 'john'
expect(gl_user.email).to eql 'john@example.com' expect(gl_user.email).to eql 'john@example.com'
...@@ -115,10 +126,10 @@ describe Gitlab::OAuth::User do ...@@ -115,10 +126,10 @@ describe Gitlab::OAuth::User do
end end
end end
end end
context "and no corresponding LDAP person" do context "and no corresponding LDAP person" do
before { allow(Gitlab::LDAP::Person).to receive(:find_by_uid).and_return(nil) } before { allow(Gitlab::LDAP::Person).to receive(:find_by_uid).and_return(nil) }
include_examples "to verify compliance with allow_single_sign_on" include_examples "to verify compliance with allow_single_sign_on"
end end
end end
...@@ -128,11 +139,11 @@ describe Gitlab::OAuth::User do ...@@ -128,11 +139,11 @@ describe Gitlab::OAuth::User do
describe 'blocking' do describe 'blocking' do
let(:provider) { 'twitter' } let(:provider) { 'twitter' }
before { Gitlab.config.omniauth.stub allow_single_sign_on: true } before { stub_omniauth_config(allow_single_sign_on: true) }
context 'signup with omniauth only' do context 'signup with omniauth only' do
context 'dont block on create' do context 'dont block on create' do
before { Gitlab.config.omniauth.stub block_auto_created_users: false } before { stub_omniauth_config(block_auto_created_users: false) }
it do it do
oauth_user.save oauth_user.save
...@@ -142,7 +153,7 @@ describe Gitlab::OAuth::User do ...@@ -142,7 +153,7 @@ describe Gitlab::OAuth::User do
end end
context 'block on create' do context 'block on create' do
before { Gitlab.config.omniauth.stub block_auto_created_users: true } before { stub_omniauth_config(block_auto_created_users: true) }
it do it do
oauth_user.save oauth_user.save
...@@ -154,17 +165,17 @@ describe Gitlab::OAuth::User do ...@@ -154,17 +165,17 @@ describe Gitlab::OAuth::User do
context 'signup with linked omniauth and LDAP account' do context 'signup with linked omniauth and LDAP account' do
before do before do
Gitlab.config.omniauth.stub auto_link_ldap_user: true stub_omniauth_config(auto_link_ldap_user: true)
ldap_user.stub(:uid) { uid } allow(ldap_user).to receive(:uid) { uid }
ldap_user.stub(:username) { uid } allow(ldap_user).to receive(:username) { uid }
ldap_user.stub(:email) { ['johndoe@example.com','john2@example.com'] } allow(ldap_user).to receive(:email) { ['johndoe@example.com','john2@example.com'] }
ldap_user.stub(:dn) { 'uid=user1,ou=People,dc=example' } allow(ldap_user).to receive(:dn) { 'uid=user1,ou=People,dc=example' }
allow(oauth_user).to receive(:ldap_person).and_return(ldap_user) allow(oauth_user).to receive(:ldap_person).and_return(ldap_user)
end end
context "and no account for the LDAP user" do context "and no account for the LDAP user" do
context 'dont block on create (LDAP)' do context 'dont block on create (LDAP)' do
before { Gitlab::LDAP::Config.any_instance.stub block_auto_created_users: false } before { allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: false) }
it do it do
oauth_user.save oauth_user.save
...@@ -174,7 +185,7 @@ describe Gitlab::OAuth::User do ...@@ -174,7 +185,7 @@ describe Gitlab::OAuth::User do
end end
context 'block on create (LDAP)' do context 'block on create (LDAP)' do
before { Gitlab::LDAP::Config.any_instance.stub block_auto_created_users: true } before { allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: true) }
it do it do
oauth_user.save oauth_user.save
...@@ -188,7 +199,7 @@ describe Gitlab::OAuth::User do ...@@ -188,7 +199,7 @@ describe Gitlab::OAuth::User do
let!(:existing_user) { create(:omniauth_user, email: 'john@example.com', extern_uid: 'uid=user1,ou=People,dc=example', provider: 'ldapmain', username: 'john') } let!(:existing_user) { create(:omniauth_user, email: 'john@example.com', extern_uid: 'uid=user1,ou=People,dc=example', provider: 'ldapmain', username: 'john') }
context 'dont block on create (LDAP)' do context 'dont block on create (LDAP)' do
before { Gitlab::LDAP::Config.any_instance.stub block_auto_created_users: false } before { allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: false) }
it do it do
oauth_user.save oauth_user.save
...@@ -198,7 +209,7 @@ describe Gitlab::OAuth::User do ...@@ -198,7 +209,7 @@ describe Gitlab::OAuth::User do
end end
context 'block on create (LDAP)' do context 'block on create (LDAP)' do
before { Gitlab::LDAP::Config.any_instance.stub block_auto_created_users: true } before { allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: true) }
it do it do
oauth_user.save oauth_user.save
...@@ -217,7 +228,7 @@ describe Gitlab::OAuth::User do ...@@ -217,7 +228,7 @@ describe Gitlab::OAuth::User do
end end
context 'dont block on create' do context 'dont block on create' do
before { Gitlab.config.omniauth.stub block_auto_created_users: false } before { stub_omniauth_config(block_auto_created_users: false) }
it do it do
oauth_user.save oauth_user.save
...@@ -227,7 +238,7 @@ describe Gitlab::OAuth::User do ...@@ -227,7 +238,7 @@ describe Gitlab::OAuth::User do
end end
context 'block on create' do context 'block on create' do
before { Gitlab.config.omniauth.stub block_auto_created_users: true } before { stub_omniauth_config(block_auto_created_users: true) }
it do it do
oauth_user.save oauth_user.save
...@@ -237,7 +248,7 @@ describe Gitlab::OAuth::User do ...@@ -237,7 +248,7 @@ describe Gitlab::OAuth::User do
end end
context 'dont block on create (LDAP)' do context 'dont block on create (LDAP)' do
before { Gitlab::LDAP::Config.any_instance.stub block_auto_created_users: false } before { allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: false) }
it do it do
oauth_user.save oauth_user.save
...@@ -247,7 +258,7 @@ describe Gitlab::OAuth::User do ...@@ -247,7 +258,7 @@ describe Gitlab::OAuth::User do
end end
context 'block on create (LDAP)' do context 'block on create (LDAP)' do
before { Gitlab::LDAP::Config.any_instance.stub block_auto_created_users: true } before { allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: true) }
it do it do
oauth_user.save oauth_user.save
......
...@@ -28,7 +28,7 @@ describe 'Gitlab::Popen', no_db: true do ...@@ -28,7 +28,7 @@ describe 'Gitlab::Popen', no_db: true do
context 'unsafe string command' do context 'unsafe string command' do
it 'raises an error when it gets called with a string argument' do it 'raises an error when it gets called with a string argument' do
expect { @klass.new.popen('ls', path) }.to raise_error expect { @klass.new.popen('ls', path) }.to raise_error(RuntimeError)
end end
end end
......
...@@ -27,7 +27,7 @@ describe 'Gitlab::Satellite::MergeAction' do ...@@ -27,7 +27,7 @@ describe 'Gitlab::Satellite::MergeAction' do
context 'between branches' do context 'between branches' do
it 'should raise exception -- not expected to be used by non forks' do it 'should raise exception -- not expected to be used by non forks' do
expect { Gitlab::Satellite::MergeAction.new(merge_request.author, merge_request).commits_between }.to raise_error expect { Gitlab::Satellite::MergeAction.new(merge_request.author, merge_request).commits_between }.to raise_error(RuntimeError)
end end
end end
end end
...@@ -75,7 +75,7 @@ describe 'Gitlab::Satellite::MergeAction' do ...@@ -75,7 +75,7 @@ describe 'Gitlab::Satellite::MergeAction' do
context 'between branches' do context 'between branches' do
it 'should get proper diffs' do it 'should get proper diffs' do
expect{ Gitlab::Satellite::MergeAction.new(merge_request.author, merge_request).diffs_between_satellite }.to raise_error expect{ Gitlab::Satellite::MergeAction.new(merge_request.author, merge_request).diffs_between_satellite }.to raise_error(RuntimeError)
end end
end end
end end
......
...@@ -10,14 +10,14 @@ describe Gitlab::Upgrader do ...@@ -10,14 +10,14 @@ describe Gitlab::Upgrader do
describe 'latest_version?' do describe 'latest_version?' do
it 'should be true if newest version' do it 'should be true if newest version' do
upgrader.stub(latest_version_raw: current_version) allow(upgrader).to receive(:latest_version_raw).and_return(current_version)
expect(upgrader.latest_version?).to be_truthy expect(upgrader.latest_version?).to be_truthy
end end
end end
describe 'latest_version_raw' do describe 'latest_version_raw' do
it 'should be latest version for GitLab 5' do it 'should be latest version for GitLab 5' do
upgrader.stub(current_version_raw: "5.3.0") allow(upgrader).to receive(:current_version_raw).and_return("5.3.0")
expect(upgrader.latest_version_raw).to eq("v5.4.2") expect(upgrader.latest_version_raw).to eq("v5.4.2")
end end
......
require 'spec_helper' require 'spec_helper'
require 'email_spec'
describe Notify do describe Notify do
include EmailSpec::Helpers include EmailSpec::Helpers
......
...@@ -14,7 +14,7 @@ describe CommitRange do ...@@ -14,7 +14,7 @@ describe CommitRange do
let(:range2) { described_class.new("#{sha_from}..#{sha_to}") } let(:range2) { described_class.new("#{sha_from}..#{sha_to}") }
it 'raises ArgumentError when given an invalid range string' do it 'raises ArgumentError when given an invalid range string' do
expect { described_class.new("Foo") }.to raise_error expect { described_class.new("Foo") }.to raise_error(ArgumentError)
end end
describe '#to_s' do describe '#to_s' do
......
...@@ -77,13 +77,13 @@ eos ...@@ -77,13 +77,13 @@ eos
let(:other_issue) { create :issue, project: other_project } let(:other_issue) { create :issue, project: other_project }
it 'detects issues that this commit is marked as closing' do it 'detects issues that this commit is marked as closing' do
commit.stub(safe_message: "Fixes ##{issue.iid}") allow(commit).to receive(:safe_message).and_return("Fixes ##{issue.iid}")
expect(commit.closes_issues).to eq([issue]) expect(commit.closes_issues).to eq([issue])
end end
it 'does not detect issues from other projects' do it 'does not detect issues from other projects' do
ext_ref = "#{other_project.path_with_namespace}##{other_issue.iid}" ext_ref = "#{other_project.path_with_namespace}##{other_issue.iid}"
commit.stub(safe_message: "Fixes #{ext_ref}") allow(commit).to receive(:safe_message).and_return("Fixes #{ext_ref}")
expect(commit.closes_issues).to be_empty expect(commit.closes_issues).to be_empty
end end
end end
...@@ -93,7 +93,9 @@ eos ...@@ -93,7 +93,9 @@ eos
let(:author) { create(:user, email: commit.author_email) } let(:author) { create(:user, email: commit.author_email) }
let(:backref_text) { "commit #{subject.id}" } let(:backref_text) { "commit #{subject.id}" }
let(:set_mentionable_text) { ->(txt){ subject.stub(safe_message: txt) } } let(:set_mentionable_text) do
->(txt) { allow(subject).to receive(:safe_message).and_return(txt) }
end
# Include the subject in the repository stub. # Include the subject in the repository stub.
let(:extra_commits) { [subject] } let(:extra_commits) { [subject] }
......
...@@ -11,7 +11,10 @@ describe Issue, "Issuable" do ...@@ -11,7 +11,10 @@ describe Issue, "Issuable" do
end end
describe "Validation" do describe "Validation" do
before { subject.stub(set_iid: false) } before do
allow(subject).to receive(:set_iid).and_return(false)
end
it { is_expected.to validate_presence_of(:project) } it { is_expected.to validate_presence_of(:project) }
it { is_expected.to validate_presence_of(:iid) } it { is_expected.to validate_presence_of(:iid) }
it { is_expected.to validate_presence_of(:author) } it { is_expected.to validate_presence_of(:author) }
......
...@@ -23,7 +23,7 @@ describe Issue, "Mentionable" do ...@@ -23,7 +23,7 @@ describe Issue, "Mentionable" do
end end
it 'correctly removes already-mentioned Commits' do it 'correctly removes already-mentioned Commits' do
expect(Note).not_to receive(:create_cross_reference_note) expect(SystemNoteService).not_to receive(:cross_reference)
issue.create_cross_references!(project, author, [commit2]) issue.create_cross_references!(project, author, [commit2])
end end
......
...@@ -58,9 +58,10 @@ describe :forked_from_project do ...@@ -58,9 +58,10 @@ describe :forked_from_project do
end end
def fork_project(from_project, user) def fork_project(from_project, user)
context = Projects::ForkService.new(from_project, user) shell = double('gitlab_shell', fork_repository: true)
shell = double("gitlab_shell")
shell.stub(fork_repository: true) service = Projects::ForkService.new(from_project, user)
context.stub(gitlab_shell: shell) allow(service).to receive(:gitlab_shell).and_return(shell)
context.execute
service.execute
end end
...@@ -50,7 +50,7 @@ describe ServiceHook do ...@@ -50,7 +50,7 @@ describe ServiceHook do
it "catches exceptions" do it "catches exceptions" do
expect(WebHook).to receive(:post).and_raise("Some HTTP Post error") expect(WebHook).to receive(:post).and_raise("Some HTTP Post error")
expect { @service_hook.execute(@data) }.to raise_error expect { @service_hook.execute(@data) }.to raise_error(RuntimeError)
end end
end end
end end
...@@ -71,7 +71,7 @@ describe ProjectHook do ...@@ -71,7 +71,7 @@ describe ProjectHook do
it "catches exceptions" do it "catches exceptions" do
expect(WebHook).to receive(:post).and_raise("Some HTTP Post error") expect(WebHook).to receive(:post).and_raise("Some HTTP Post error")
expect { @project_hook.execute(@data, 'push_hooks') }.to raise_error expect { @project_hook.execute(@data, 'push_hooks') }.to raise_error(RuntimeError)
end end
end end
end end
...@@ -70,7 +70,7 @@ describe Issue do ...@@ -70,7 +70,7 @@ describe Issue do
it_behaves_like 'an editable mentionable' do it_behaves_like 'an editable mentionable' do
subject { create(:issue, project: project) } subject { create(:issue, project: project) }
let(:backref_text) { "issue ##{subject.iid}" } let(:backref_text) { "issue #{subject.to_reference}" }
let(:set_mentionable_text) { ->(txt){ subject.description = txt } } let(:set_mentionable_text) { ->(txt){ subject.description = txt } }
end end
......
...@@ -24,8 +24,11 @@ describe GroupMember do ...@@ -24,8 +24,11 @@ describe GroupMember do
describe "#after_create" do describe "#after_create" do
it "should send email to user" do it "should send email to user" do
membership = build(:group_member) membership = build(:group_member)
membership.stub(notification_service: double('NotificationService').as_null_object)
allow(membership).to receive(:notification_service).
and_return(double('NotificationService').as_null_object)
expect(membership).to receive(:notification_service) expect(membership).to receive(:notification_service)
membership.save membership.save
end end
end end
...@@ -33,7 +36,8 @@ describe GroupMember do ...@@ -33,7 +36,8 @@ describe GroupMember do
describe "#after_update" do describe "#after_update" do
before do before do
@group_member = create :group_member @group_member = create :group_member
@group_member.stub(notification_service: double('NotificationService').as_null_object) allow(@group_member).to receive(:notification_service).
and_return(double('NotificationService').as_null_object)
end end
it "should send email to user" do it "should send email to user" do
......
...@@ -111,17 +111,18 @@ describe MergeRequest do ...@@ -111,17 +111,18 @@ describe MergeRequest do
let(:commit2) { double('commit2', closes_issues: [issue1]) } let(:commit2) { double('commit2', closes_issues: [issue1]) }
before do before do
subject.stub(commits: [commit0, commit1, commit2]) allow(subject).to receive(:commits).and_return([commit0, commit1, commit2])
end end
it 'accesses the set of issues that will be closed on acceptance' do it 'accesses the set of issues that will be closed on acceptance' do
subject.project.stub(default_branch: subject.target_branch) allow(subject.project).to receive(:default_branch).
and_return(subject.target_branch)
expect(subject.closes_issues).to eq([issue0, issue1].sort_by(&:id)) expect(subject.closes_issues).to eq([issue0, issue1].sort_by(&:id))
end end
it 'only lists issues as to be closed if it targets the default branch' do it 'only lists issues as to be closed if it targets the default branch' do
subject.project.stub(default_branch: 'master') allow(subject.project).to receive(:default_branch).and_return('master')
subject.target_branch = 'something-else' subject.target_branch = 'something-else'
expect(subject.closes_issues).to be_empty expect(subject.closes_issues).to be_empty
...@@ -130,7 +131,8 @@ describe MergeRequest do ...@@ -130,7 +131,8 @@ describe MergeRequest do
it 'detects issues mentioned in the description' do it 'detects issues mentioned in the description' do
issue2 = create(:issue, project: subject.project) issue2 = create(:issue, project: subject.project)
subject.description = "Closes #{issue2.to_reference}" subject.description = "Closes #{issue2.to_reference}"
subject.project.stub(default_branch: subject.target_branch) allow(subject.project).to receive(:default_branch).
and_return(subject.target_branch)
expect(subject.closes_issues).to include(issue2) expect(subject.closes_issues).to include(issue2)
end end
...@@ -163,10 +165,10 @@ describe MergeRequest do ...@@ -163,10 +165,10 @@ describe MergeRequest do
end end
it_behaves_like 'an editable mentionable' do it_behaves_like 'an editable mentionable' do
subject { create(:merge_request, source_project: project, target_project: project) } subject { create(:merge_request, source_project: project) }
let(:backref_text) { "merge request !#{subject.iid}" } let(:backref_text) { "merge request #{subject.to_reference}" }
let(:set_mentionable_text) { ->(txt){ subject.title = txt } } let(:set_mentionable_text) { ->(txt){ subject.description = txt } }
end end
it_behaves_like 'a Taskable' do it_behaves_like 'a Taskable' do
......
...@@ -21,11 +21,11 @@ describe Milestone do ...@@ -21,11 +21,11 @@ describe Milestone do
it { is_expected.to have_many(:issues) } it { is_expected.to have_many(:issues) }
end end
describe "Mass assignment" do
end
describe "Validation" do describe "Validation" do
before { subject.stub(set_iid: false) } before do
allow(subject).to receive(:set_iid).and_return(false)
end
it { is_expected.to validate_presence_of(:title) } it { is_expected.to validate_presence_of(:title) }
it { is_expected.to validate_presence_of(:project) } it { is_expected.to validate_presence_of(:project) }
end end
...@@ -66,7 +66,7 @@ describe Milestone do ...@@ -66,7 +66,7 @@ describe Milestone do
describe :expired? do describe :expired? do
context "expired" do context "expired" do
before do before do
milestone.stub(due_date: Date.today.prev_year) allow(milestone).to receive(:due_date).and_return(Date.today.prev_year)
end end
it { expect(milestone.expired?).to be_truthy } it { expect(milestone.expired?).to be_truthy }
...@@ -74,7 +74,7 @@ describe Milestone do ...@@ -74,7 +74,7 @@ describe Milestone do
context "not expired" do context "not expired" do
before do before do
milestone.stub(due_date: Date.today.next_year) allow(milestone).to receive(:due_date).and_return(Date.today.next_year)
end end
it { expect(milestone.expired?).to be_falsey } it { expect(milestone.expired?).to be_falsey }
...@@ -83,7 +83,7 @@ describe Milestone do ...@@ -83,7 +83,7 @@ describe Milestone do
describe :percent_complete do describe :percent_complete do
before do before do
milestone.stub( allow(milestone).to receive_messages(
closed_items_count: 3, closed_items_count: 3,
total_items_count: 4 total_items_count: 4
) )
......
...@@ -53,7 +53,7 @@ describe Namespace do ...@@ -53,7 +53,7 @@ describe Namespace do
describe :move_dir do describe :move_dir do
before do before do
@namespace = create :namespace @namespace = create :namespace
@namespace.stub(path_changed?: true) allow(@namespace).to receive(:path_changed?).and_return(true)
end end
it "should raise error when directory exists" do it "should raise error when directory exists" do
...@@ -62,8 +62,8 @@ describe Namespace do ...@@ -62,8 +62,8 @@ describe Namespace do
it "should move dir if path changed" do it "should move dir if path changed" do
new_path = @namespace.path + "_new" new_path = @namespace.path + "_new"
@namespace.stub(path_was: @namespace.path) allow(@namespace).to receive(:path_was).and_return(@namespace.path)
@namespace.stub(path: new_path) allow(@namespace).to receive(:path).and_return(new_path)
expect(@namespace.move_dir).to be_truthy expect(@namespace.move_dir).to be_truthy
end end
end end
......
...@@ -42,7 +42,7 @@ describe AsanaService, models: true do ...@@ -42,7 +42,7 @@ describe AsanaService, models: true do
before do before do
@asana = AsanaService.new @asana = AsanaService.new
@asana.stub( allow(@asana).to receive_messages(
project: project, project: project,
project_id: project.id, project_id: project.id,
service_hook: true, service_hook: true,
......
...@@ -32,7 +32,7 @@ describe AssemblaService, models: true do ...@@ -32,7 +32,7 @@ describe AssemblaService, models: true do
before do before do
@assembla_service = AssemblaService.new @assembla_service = AssemblaService.new
@assembla_service.stub( allow(@assembla_service).to receive_messages(
project_id: project.id, project_id: project.id,
project: project, project: project,
service_hook: true, service_hook: true,
......
...@@ -29,12 +29,10 @@ describe BuildkiteService do ...@@ -29,12 +29,10 @@ describe BuildkiteService do
describe 'commits methods' do describe 'commits methods' do
before do before do
@project = Project.new @project = Project.new
@project.stub( allow(@project).to receive(:default_branch).and_return('default-brancho')
default_branch: 'default-brancho'
)
@service = BuildkiteService.new @service = BuildkiteService.new
@service.stub( allow(@service).to receive_messages(
project: @project, project: @project,
service_hook: true, service_hook: true,
project_url: 'https://buildkite.com/account-name/example-project', project_url: 'https://buildkite.com/account-name/example-project',
......
...@@ -32,7 +32,7 @@ describe FlowdockService do ...@@ -32,7 +32,7 @@ describe FlowdockService do
before do before do
@flowdock_service = FlowdockService.new @flowdock_service = FlowdockService.new
@flowdock_service.stub( allow(@flowdock_service).to receive_messages(
project_id: project.id, project_id: project.id,
project: project, project: project,
service_hook: true, service_hook: true,
......
...@@ -32,7 +32,7 @@ describe GemnasiumService do ...@@ -32,7 +32,7 @@ describe GemnasiumService do
before do before do
@gemnasium_service = GemnasiumService.new @gemnasium_service = GemnasiumService.new
@gemnasium_service.stub( allow(@gemnasium_service).to receive_messages(
project_id: project.id, project_id: project.id,
project: project, project: project,
service_hook: true, service_hook: true,
......
...@@ -21,18 +21,15 @@ ...@@ -21,18 +21,15 @@
require 'spec_helper' require 'spec_helper'
describe GitlabCiService do describe GitlabCiService do
describe "Associations" do describe 'associations' do
it { is_expected.to belong_to :project } it { is_expected.to belong_to(:project) }
it { is_expected.to have_one :service_hook } it { is_expected.to have_one(:service_hook) }
end
describe "Mass assignment" do
end end
describe 'commits methods' do describe 'commits methods' do
before do before do
@service = GitlabCiService.new @service = GitlabCiService.new
@service.stub( allow(@service).to receive_messages(
service_hook: true, service_hook: true,
project_url: 'http://ci.gitlab.org/projects/2', project_url: 'http://ci.gitlab.org/projects/2',
token: 'verySecret' token: 'verySecret'
...@@ -56,9 +53,9 @@ describe GitlabCiService do ...@@ -56,9 +53,9 @@ describe GitlabCiService do
it "calls ci_yaml_file" do it "calls ci_yaml_file" do
service_hook = double service_hook = double
service_hook.should_receive(:execute) expect(service_hook).to receive(:execute)
@service.should_receive(:service_hook).and_return(service_hook) expect(@service).to receive(:service_hook).and_return(service_hook)
@service.should_receive(:ci_yaml_file).with(push_sample_data[:checkout_sha]) expect(@service).to receive(:ci_yaml_file).with(push_sample_data[:checkout_sha])
@service.execute(push_sample_data) @service.execute(push_sample_data)
end end
...@@ -72,7 +69,7 @@ describe GitlabCiService do ...@@ -72,7 +69,7 @@ describe GitlabCiService do
@user = create(:user) @user = create(:user)
@service = GitlabCiService.new @service = GitlabCiService.new
@service.stub( allow(@service).to receive_messages(
service_hook: true, service_hook: true,
project_url: 'http://ci.gitlab.org/projects/2', project_url: 'http://ci.gitlab.org/projects/2',
token: 'verySecret', token: 'verySecret',
......
...@@ -37,7 +37,7 @@ describe HipchatService do ...@@ -37,7 +37,7 @@ describe HipchatService do
let(:push_sample_data) { Gitlab::PushDataBuilder.build_sample(project, user) } let(:push_sample_data) { Gitlab::PushDataBuilder.build_sample(project, user) }
before(:each) do before(:each) do
hipchat.stub( allow(hipchat).to receive_messages(
project_id: project.id, project_id: project.id,
project: project, project: project,
room: 123456, room: 123456,
...@@ -48,7 +48,7 @@ describe HipchatService do ...@@ -48,7 +48,7 @@ describe HipchatService do
end end
it 'should use v1 if version is provided' do it 'should use v1 if version is provided' do
hipchat.stub(api_version: 'v1') allow(hipchat).to receive(:api_version).and_return('v1')
expect(HipChat::Client).to receive(:new). expect(HipChat::Client).to receive(:new).
with(token, with(token,
api_version: 'v1', api_version: 'v1',
...@@ -59,7 +59,7 @@ describe HipchatService do ...@@ -59,7 +59,7 @@ describe HipchatService do
end end
it 'should use v2 as the version when nothing is provided' do it 'should use v2 as the version when nothing is provided' do
hipchat.stub(api_version: '') allow(hipchat).to receive(:api_version).and_return('')
expect(HipChat::Client).to receive(:new). expect(HipChat::Client).to receive(:new).
with(token, with(token,
api_version: 'v2', api_version: 'v2',
...@@ -245,12 +245,12 @@ describe HipchatService do ...@@ -245,12 +245,12 @@ describe HipchatService do
end end
it "should set notfiy to true" do it "should set notfiy to true" do
hipchat.stub(notify: '1') allow(hipchat).to receive(:notify).and_return('1')
expect(hipchat.send(:message_options)).to eq({ notify: true, color: 'yellow' }) expect(hipchat.send(:message_options)).to eq({ notify: true, color: 'yellow' })
end end
it "should set the color" do it "should set the color" do
hipchat.stub(color: 'red') allow(hipchat).to receive(:color).and_return('red')
expect(hipchat.send(:message_options)).to eq({ notify: false, color: 'red' }) expect(hipchat.send(:message_options)).to eq({ notify: false, color: 'red' })
end end
end end
......
...@@ -24,8 +24,8 @@ require 'json' ...@@ -24,8 +24,8 @@ require 'json'
describe IrkerService do describe IrkerService do
describe 'Associations' do describe 'Associations' do
it { should belong_to :project } it { is_expected.to belong_to :project }
it { should have_one :service_hook } it { is_expected.to have_one :service_hook }
end end
describe 'Validations' do describe 'Validations' do
...@@ -66,7 +66,7 @@ describe IrkerService do ...@@ -66,7 +66,7 @@ describe IrkerService do
let(:colorize_messages) { '1' } let(:colorize_messages) { '1' }
before do before do
irker.stub( allow(irker).to receive_messages(
active: true, active: true,
project: project, project: project,
project_id: project.id, project_id: project.id,
......
...@@ -52,7 +52,7 @@ describe PushoverService do ...@@ -52,7 +52,7 @@ describe PushoverService do
let(:api_url) { 'https://api.pushover.net/1/messages.json' } let(:api_url) { 'https://api.pushover.net/1/messages.json' }
before do before do
pushover.stub( allow(pushover).to receive_messages(
project: project, project: project,
project_id: project.id, project_id: project.id,
service_hook: true, service_hook: true,
......
...@@ -46,7 +46,7 @@ describe SlackService do ...@@ -46,7 +46,7 @@ describe SlackService do
let(:channel) { 'slack_channel' } let(:channel) { 'slack_channel' }
before do before do
slack.stub( allow(slack).to receive_messages(
project: project, project: project,
project_id: project.id, project_id: project.id,
service_hook: true, service_hook: true,
...@@ -96,7 +96,7 @@ describe SlackService do ...@@ -96,7 +96,7 @@ describe SlackService do
end end
it 'should use the username as an option for slack when configured' do it 'should use the username as an option for slack when configured' do
slack.stub(username: username) allow(slack).to receive(:username).and_return(username)
expect(Slack::Notifier).to receive(:new). expect(Slack::Notifier).to receive(:new).
with(webhook_url, username: username). with(webhook_url, username: username).
and_return( and_return(
...@@ -106,7 +106,7 @@ describe SlackService do ...@@ -106,7 +106,7 @@ describe SlackService do
end end
it 'should use the channel as an option when it is configured' do it 'should use the channel as an option when it is configured' do
slack.stub(channel: channel) allow(slack).to receive(:channel).and_return(channel)
expect(Slack::Notifier).to receive(:new). expect(Slack::Notifier).to receive(:new).
with(webhook_url, channel: channel). with(webhook_url, channel: channel).
and_return( and_return(
...@@ -130,11 +130,11 @@ describe SlackService do ...@@ -130,11 +130,11 @@ describe SlackService do
let(:webhook_url) { 'https://hooks.slack.com/services/SVRWFV0VVAR97N/B02R25XN3/ZBqu7xMupaEEICInN685' } let(:webhook_url) { 'https://hooks.slack.com/services/SVRWFV0VVAR97N/B02R25XN3/ZBqu7xMupaEEICInN685' }
before do before do
slack.stub( allow(slack).to receive_messages(
project: project, project: project,
project_id: project.id, project_id: project.id,
service_hook: true, service_hook: true,
webhook: webhook_url webhook: webhook_url
) )
WebMock.stub_request(:post, webhook_url) WebMock.stub_request(:post, webhook_url)
......
...@@ -127,7 +127,7 @@ describe Project do ...@@ -127,7 +127,7 @@ describe Project do
describe 'last_activity' do describe 'last_activity' do
it 'should alias last_activity to last_event' do it 'should alias last_activity to last_event' do
project.stub(last_event: last_event) allow(project).to receive(:last_event).and_return(last_event)
expect(project.last_activity).to eq(last_event) expect(project.last_activity).to eq(last_event)
end end
end end
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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