kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Updated failing tests

Browse source
This commit is contained in:
Phil Hughes 2016-05-25 09:11:47 +01:00
parent 8b40a7745b
commit 48726e9d30
4 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/pages/commits.scss
View file

@ -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 {

4
app/helpers/button_helper.rb
View file

@ -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

3
app/helpers/commits_helper.rb
View file

@ -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: "")

6
features/steps/project/source/browse_files.rb
View file

@ -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