From f177aaa5fa789654dc440d6ec4ae3546544c1401 Mon Sep 17 00:00:00 2001 From: Drew Blessing Date: Thu, 17 Dec 2015 16:08:14 -0600 Subject: Backport JIRA service --- spec/helpers/merge_requests_helper_spec.rb | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'spec/helpers') diff --git a/spec/helpers/merge_requests_helper_spec.rb b/spec/helpers/merge_requests_helper_spec.rb index 0ef1efb8bce..28fb3216f60 100644 --- a/spec/helpers/merge_requests_helper_spec.rb +++ b/spec/helpers/merge_requests_helper_spec.rb @@ -1,24 +1,37 @@ require 'spec_helper' describe MergeRequestsHelper do - describe "#issues_sentence" do + describe '#issues_sentence' do subject { issues_sentence(issues) } let(:issues) do [build(:issue, iid: 1), build(:issue, iid: 2), build(:issue, iid: 3)] end it { is_expected.to eq('#1, #2, and #3') } + + context 'for JIRA issues' do + let(:project) { create(:project) } + let(:issues) do + [ + JiraIssue.new('JIRA-123', project), + JiraIssue.new('JIRA-456', project), + JiraIssue.new('FOOBAR-7890', project) + ] + end + + it { is_expected.to eq('FOOBAR-7890, JIRA-123, and JIRA-456') } + end end - describe "#format_mr_branch_names" do - describe "within the same project" do + describe '#format_mr_branch_names' do + describe 'within the same project' do let(:merge_request) { create(:merge_request) } subject { format_mr_branch_names(merge_request) } it { is_expected.to eq([merge_request.source_branch, merge_request.target_branch]) } end - describe "within different projects" do + describe 'within different projects' do let(:project) { create(:project) } let(:fork_project) { create(:project, forked_from_project: project) } let(:merge_request) { create(:merge_request, source_project: fork_project, target_project: project) } -- cgit v1.2.1 From 66a8281fddf8e4f9d39265a6bfb38e8a6a8309c2 Mon Sep 17 00:00:00 2001 From: Drew Blessing Date: Mon, 21 Dec 2015 14:56:11 -0600 Subject: Fix and test leave project display --- spec/helpers/projects_helper_spec.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'spec/helpers') diff --git a/spec/helpers/projects_helper_spec.rb b/spec/helpers/projects_helper_spec.rb index f2efb528aeb..53207767581 100644 --- a/spec/helpers/projects_helper_spec.rb +++ b/spec/helpers/projects_helper_spec.rb @@ -53,6 +53,16 @@ describe ProjectsHelper do end end + describe 'user_max_access_in_project' do + let(:project) { create(:project) } + let(:user) { create(:user) } + before do + project.team.add_user(user, Gitlab::Access::MASTER) + end + + it { expect(helper.user_max_access_in_project(user.id, project)).to eq('Master') } + end + describe "readme_cache_key" do let(:project) { create(:project) } -- cgit v1.2.1 From 0d05400bdee182de0564e4b0ac85f9365aa76adb Mon Sep 17 00:00:00 2001 From: Marvin Frick Date: Tue, 10 Jun 2014 21:21:28 +0200 Subject: removes api credentials from link to build_page Also adds a spec for MergeRequestHelper to avoid having a regression later on. --- spec/helpers/merge_request_helper_spec.rb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 spec/helpers/merge_request_helper_spec.rb (limited to 'spec/helpers') diff --git a/spec/helpers/merge_request_helper_spec.rb b/spec/helpers/merge_request_helper_spec.rb new file mode 100644 index 00000000000..5363511706e --- /dev/null +++ b/spec/helpers/merge_request_helper_spec.rb @@ -0,0 +1,22 @@ +require "spec_helper" + +describe MergeRequestsHelper do + let(:project) { create :project } + let(:merge_request) { MergeRequest.new } + let(:ci_service) { CiService.new } + let(:last_commit) { Commit.new({}) } + + before do + merge_request.stub(:source_project) { project } + merge_request.stub(:last_commit) { last_commit } + project.stub(:ci_service) { ci_service } + last_commit.stub(:sha) { '12d65c' } + end + + describe :ci_build_details_path do + it 'does not include api credentials in a link' do + ci_service.stub(:build_page) { "http://secretuser:secretpass@jenkins.example.com:8888/job/test1/scm/bySHA1/12d65c" } + expect(ci_build_details_path(merge_request)).to_not match("secret") + end + end +end \ No newline at end of file -- cgit v1.2.1 From 09008026f6ed5eebc94cbaaa8edf323c8aaad280 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Mon, 21 Dec 2015 21:57:51 -0500 Subject: Move `ci_build_details_path` helper spec to correct location Also, make it not fail. --- spec/helpers/merge_request_helper_spec.rb | 22 ---------------------- spec/helpers/merge_requests_helper_spec.rb | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 22 deletions(-) delete mode 100644 spec/helpers/merge_request_helper_spec.rb (limited to 'spec/helpers') diff --git a/spec/helpers/merge_request_helper_spec.rb b/spec/helpers/merge_request_helper_spec.rb deleted file mode 100644 index 5363511706e..00000000000 --- a/spec/helpers/merge_request_helper_spec.rb +++ /dev/null @@ -1,22 +0,0 @@ -require "spec_helper" - -describe MergeRequestsHelper do - let(:project) { create :project } - let(:merge_request) { MergeRequest.new } - let(:ci_service) { CiService.new } - let(:last_commit) { Commit.new({}) } - - before do - merge_request.stub(:source_project) { project } - merge_request.stub(:last_commit) { last_commit } - project.stub(:ci_service) { ci_service } - last_commit.stub(:sha) { '12d65c' } - end - - describe :ci_build_details_path do - it 'does not include api credentials in a link' do - ci_service.stub(:build_page) { "http://secretuser:secretpass@jenkins.example.com:8888/job/test1/scm/bySHA1/12d65c" } - expect(ci_build_details_path(merge_request)).to_not match("secret") - end - end -end \ No newline at end of file diff --git a/spec/helpers/merge_requests_helper_spec.rb b/spec/helpers/merge_requests_helper_spec.rb index 28fb3216f60..600e1c4e9ec 100644 --- a/spec/helpers/merge_requests_helper_spec.rb +++ b/spec/helpers/merge_requests_helper_spec.rb @@ -1,6 +1,26 @@ require 'spec_helper' describe MergeRequestsHelper do + describe 'ci_build_details_path' do + let(:project) { create :project } + let(:merge_request) { MergeRequest.new } + let(:ci_service) { CiService.new } + let(:last_commit) { Ci::Commit.new({}) } + + before do + allow(merge_request).to receive(:source_project).and_return(project) + allow(merge_request).to receive(:last_commit).and_return(last_commit) + allow(project).to receive(:ci_service).and_return(ci_service) + allow(last_commit).to receive(:sha).and_return('12d65c') + end + + it 'does not include api credentials in a link' do + allow(ci_service). + to receive(:build_page).and_return("http://secretuser:secretpass@jenkins.example.com:8888/job/test1/scm/bySHA1/12d65c") + expect(helper.ci_build_details_path(merge_request)).to_not match("secret") + end + end + describe '#issues_sentence' do subject { issues_sentence(issues) } let(:issues) do -- cgit v1.2.1 From a48dd40a926fdeddfdd76cea5db468a82096c7f4 Mon Sep 17 00:00:00 2001 From: Valery Sizov Date: Thu, 17 Dec 2015 14:29:55 +0200 Subject: base implementation of emoji picker [ci skip] --- spec/helpers/issues_helper_spec.rb | 6 ------ 1 file changed, 6 deletions(-) (limited to 'spec/helpers') diff --git a/spec/helpers/issues_helper_spec.rb b/spec/helpers/issues_helper_spec.rb index 1f2c4ee77b5..0fd96c7dc27 100644 --- a/spec/helpers/issues_helper_spec.rb +++ b/spec/helpers/issues_helper_spec.rb @@ -127,12 +127,6 @@ describe IssuesHelper do it { is_expected.to eq("!1, !2, or !3") } end - describe "#url_to_emoji" do - it "returns url" do - expect(url_to_emoji("smile")).to include("emoji/1F604.png") - end - end - describe "#emoji_list" do it "returns url" do expect(emoji_list).to be_kind_of(Array) -- cgit v1.2.1 From 0ae0881250055e6924f35af6ef24b0a56468732d Mon Sep 17 00:00:00 2001 From: Valery Sizov Date: Tue, 22 Dec 2015 19:39:15 +0200 Subject: fix specs --- spec/helpers/issues_helper_spec.rb | 6 ------ 1 file changed, 6 deletions(-) (limited to 'spec/helpers') diff --git a/spec/helpers/issues_helper_spec.rb b/spec/helpers/issues_helper_spec.rb index 0fd96c7dc27..04e795025d2 100644 --- a/spec/helpers/issues_helper_spec.rb +++ b/spec/helpers/issues_helper_spec.rb @@ -127,12 +127,6 @@ describe IssuesHelper do it { is_expected.to eq("!1, !2, or !3") } end - describe "#emoji_list" do - it "returns url" do - expect(emoji_list).to be_kind_of(Array) - end - end - describe "#note_active_class" do before do @note = create :note -- cgit v1.2.1