Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-12-22 20:39:15 +0300
committerValery Sizov <vsv2711@gmail.com>2015-12-23 00:12:23 +0300
commit0ae0881250055e6924f35af6ef24b0a56468732d (patch)
tree87fbe3c142e3ec07e604abe6a3c6076c915d5e44
parente5eb700d5e8d561dc8a7ff3d35f5a8c867c4e19b (diff)
fix specs
-rw-r--r--app/helpers/issues_helper.rb6
-rw-r--r--features/steps/project/issues/award_emoji.rb4
-rw-r--r--spec/helpers/issues_helper_spec.rb6
3 files changed, 6 insertions, 10 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 6474e3ceee5..2bcde9c2ba3 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -97,8 +97,10 @@ module IssuesHelper
def emoji_icon(name, unicode = nil)
unicode ||= Emoji.emoji_filename(name)
- content_tag :div, "", class: "icon emoji-icon emoji-#{unicode}",
- "data-emoji" => name, "data-unicode-name" => unicode
+ content_tag :div, "",
+ class: "icon emoji-icon emoji-#{unicode}",
+ "data-emoji" => name,
+ "data-unicode-name" => unicode
end
def emoji_author_list(notes, current_user)
diff --git a/features/steps/project/issues/award_emoji.rb b/features/steps/project/issues/award_emoji.rb
index 325eaf2ea6a..e367323f4a5 100644
--- a/features/steps/project/issues/award_emoji.rb
+++ b/features/steps/project/issues/award_emoji.rb
@@ -15,8 +15,8 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
end
step 'I click to emoji in the picker' do
- page.within '.awards-menu' do
- page.first('img').click
+ page.within '.emoji-menu' do
+ page.first('.emoji-icon').click
end
end
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