Commit 95cda2cf authored by Lin Jen-Shin's avatar Lin Jen-Shin
Browse files

Merge branch 'ce-reduce-diff-with-ce-in-spec-helpers' into 'master'

[CE] Reduce diff with EE in `spec/helpers`

Closes gitlab-ee#10143

See merge request gitlab-org/gitlab-ce!26706
parents a06f9a33 f6aa22fc
......@@ -65,12 +65,10 @@
end
describe '#brand_title' do
it 'returns the default CE title when no appearance is present' do
allow(helper)
.to receive(:current_appearance)
.and_return(nil)
it 'returns the default title when no appearance is present' do
allow(helper).to receive(:current_appearance).and_return(nil)
expect(helper.brand_title).to eq('GitLab Community Edition')
expect(helper.brand_title).to eq(helper.default_brand_title)
end
end
end
# frozen_string_literal: true
require "spec_helper"
describe AuthHelper do
......
# frozen_string_literal: true
require 'spec_helper'
describe GroupsHelper do
......
# frozen_string_literal: true
require 'spec_helper'
describe IssuablesHelper do
......@@ -176,7 +178,7 @@
stub_commonmark_sourcepos_disabled
end
it 'returns the correct json for an issue' do
it 'returns the correct data for an issue' do
issue = create(:issue, author: user, description: 'issue text')
@project = issue.project
......@@ -198,7 +200,7 @@
initialDescriptionText: 'issue text',
initialTaskStatus: '0 of 0 tasks completed'
}
expect(helper.issuable_initial_data(issue)).to eq(expected_data)
expect(helper.issuable_initial_data(issue)).to match(hash_including(expected_data))
end
end
end
# frozen_string_literal: true
require 'spec_helper'
describe MergeRequestsHelper do
......
# frozen_string_literal: true
require 'spec_helper'
describe ProjectsHelper do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment