Fix specs

This commit is contained in:
Douwe Maan
2015-12-03 20:01:35 +01:00
parent e41a0c60f4
commit e5c865eebf
6 changed files with 14 additions and 25 deletions
@@ -90,6 +90,17 @@
}
}
.issuable-show-labels {
a {
margin-right: 5px;
margin-bottom: 5px;
display: inline-block;
.color-label {
padding: 6px 10px;
}
}
}
.cross-project-reference {
text-align: center;
width: 100%;
-11
View File
@@ -56,17 +56,6 @@
}
}
.issue-show-labels {
a {
margin-right: 5px;
margin-bottom: 5px;
display: inline-block;
.color-label {
padding: 6px 10px;
}
}
}
form.edit-issue {
margin: 0;
}
@@ -183,17 +183,6 @@
display: none;
}
.merge-request-show-labels {
a {
margin-right: 5px;
margin-bottom: 5px;
display: inline-block;
.color-label {
padding: 6px 10px;
}
}
}
.merge-request-form .select2-container {
width: 250px !important;
}
+1 -1
View File
@@ -33,7 +33,7 @@
%div.prepend-top-default.clearfix
.issuable-context-title
%label Labels
.merge-request-show-labels
.issuable-show-labels
- issuable.labels.each do |label|
= link_to_label(label)
@@ -115,7 +115,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
expect(find(:select, "merge_request_source_project_id", {}).value).to eq @forked_project.id.to_s
expect(find(:select, "merge_request_target_project_id", {}).value).to eq @project.id.to_s
expect(find(:select, "merge_request_source_branch", {}).value).to eq ""
expect(find(:select, "merge_request_target_branch", {}).value).to eq ""
expect(find(:select, "merge_request_target_branch", {}).value).to eq "master"
click_button "Compare branches"
end
+1 -1
View File
@@ -86,7 +86,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
end
step 'I should see label \'bug\' with issue' do
page.within '.issue-show-labels' do
page.within '.issuable-show-labels' do
expect(page).to have_content 'bug'
end
end