summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-05-25 09:11:47 +0100
committerPhil Hughes <me@iamphill.com>2016-06-08 10:10:51 +0100
commit48726e9d307536318c7d87e2ba93f93582e22bfa (patch)
treedfa83fdcab67b1a6f0d83fe0d106ecf8ceb2c284
parent8b40a7745be84659c10db02e3bbb74126bd42414 (diff)
downloadgitlab-ce-48726e9d307536318c7d87e2ba93f93582e22bfa.tar.gz
Updated failing tests
-rw-r--r--app/assets/stylesheets/pages/commits.scss4
-rw-r--r--app/helpers/button_helper.rb4
-rw-r--r--app/helpers/commits_helper.rb3
-rw-r--r--features/steps/project/source/browse_files.rb6
4 files changed, 7 insertions, 10 deletions
diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss
index d360a224848..ba8d9cce49b 100644
--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -10,8 +10,8 @@
.commit-header {
padding: 5px 10px;
background-color: $background-color;
- border-top: 1px solid $border-color;
- border-bottom: 1px solid $border-color;
+ border-bottom: 1px solid #eee;
+ border-bottom: 1px solid #eee;
font-size: 14px;
&:first-child {
diff --git a/app/helpers/button_helper.rb b/app/helpers/button_helper.rb
index fabd726aae9..07a3f452460 100644
--- a/app/helpers/button_helper.rb
+++ b/app/helpers/button_helper.rb
@@ -14,10 +14,10 @@ module ButtonHelper
# # => "<button class='...' data-clipboard-target='div#foo'>...</button>"
#
# See http://clipboardjs.com/#usage
- def clipboard_button(data = {}, css_class: 'btn-clipboard')
+ def clipboard_button(data = {})
content_tag :button,
icon('clipboard'),
- class: "btn #{css_class}",
+ class: "btn",
data: data,
type: :button
end
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index 97d52b1fb9e..3dbb6e4a551 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -20,10 +20,7 @@ module CommitsHelper
options = options.merge(source: :author)
user = commit.send(options[:source])
- source_name = clean(commit.send "#{options[:source]}_name".to_sym)
source_email = clean(commit.send "#{options[:source]}_email".to_sym)
-
- person_name = user.try(:name) || source_name
person_email = user.try(:email) || source_email
image_tag(avatar_icon(person_email, options[:size]), class: "avatar #{"s#{options[:size]}" if options[:size]}", width: options[:size], alt: "")
diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb
index 2c0498de3b9..79a3ed8197e 100644
--- a/features/steps/project/source/browse_files.rb
+++ b/features/steps/project/source/browse_files.rb
@@ -202,8 +202,8 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
end
step 'I see Browse dir link' do
- expect(page).to have_link 'Browse Directory »'
- expect(page).not_to have_link 'Browse Code »'
+ expect(page).to have_link 'Browse Directory'
+ expect(page).not_to have_link 'Browse Code'
end
step 'I click on readme file' do
@@ -219,7 +219,7 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
step 'I see Browse code link' do
expect(page).to have_link 'Browse Files'
- expect(page).not_to have_link 'Browse Directory »'
+ expect(page).not_to have_link 'Browse Directory'
end
step 'I click on Permalink' do