Commit 39ea486e authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fixed specs. Some css fixes

parent 8652cd89
...@@ -1092,13 +1092,12 @@ p.time { ...@@ -1092,13 +1092,12 @@ p.time {
position: absolute; position: absolute;
right:14px; right:14px;
top:7px; top:7px;
height: 30px;
} }
div.attachments { div.attachments {
position:relative; position:relative;
width: 350px; width: 350px;
height: 30px; height: 36px;
overflow:hidden; overflow:hidden;
margin:0 0 5px !important; margin:0 0 5px !important;
} }
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
.clearfix .clearfix
= f.label :description, "Issue Details" = f.label :description, "Issue Details"
.input .input
= f.text_area :description, :maxlength => 2000, :class => "xxlarge" = f.text_area :description, :maxlength => 2000, :class => "xxlarge", :rows => 10
%p.hint Markdown is enabled. %p.hint Markdown is enabled.
.clearfix .clearfix
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
%strong.author= link_to_issue_assignee(@issue) %strong.author= link_to_issue_assignee(@issue)
%div %div
- if @issue.description - if @issue.description.present?
%hr %hr
= markdown @issue.description = markdown @issue.description
......
...@@ -30,20 +30,10 @@ ...@@ -30,20 +30,10 @@
.merge_request_box .merge_request_box
.merge_request_status_holder .merge_request_status_holder
- if @merge_request.closed
%h5 %h5
- if @merge_request.closed
.alert-message.error.status_info Closed .alert-message.error.status_info Closed
- if @merge_request.merged?
%span
Merged by #{@merge_request.merge_event.author_name}
%small #{time_ago_in_words(@merge_request.merge_event.created_at)} ago.
- elsif @merge_request.closed_event
%span
Closed by #{@merge_request.closed_event.author_name}
%small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago.
%br
- else - else
%h5
.alert-message.success.status_info Open .alert-message.success.status_info Open
= @merge_request.title = @merge_request.title
...@@ -59,6 +49,18 @@ ...@@ -59,6 +49,18 @@
%strong.author= link_to_merge_request_assignee(@merge_request) %strong.author= link_to_merge_request_assignee(@merge_request)
- if @merge_request.closed
%hr
- if @merge_request.merged?
%span
Merged by #{@merge_request.merge_event.author_name}
%small #{time_ago_in_words(@merge_request.merge_event.created_at)} ago.
- elsif @merge_request.closed_event
%span
Closed by #{@merge_request.closed_event.author_name}
%small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago.
%br
= render "merge_requests/commits" = render "merge_requests/commits"
......
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
.span8 .span8
%h5 Attachment: %h5 Attachment:
.clearfix .clearfix
.attachments.entry .attachments
%div.file_name File name... %div.file_name File name...
%button.file_upload.btn.primary.small Upload File %button.file_upload.btn.small Upload File
.input= f.file_field :attachment, :class => "input-file" .input= f.file_field :attachment, :class => "input-file"
%span Any file less then 10 MB %span Any file less then 10 MB
......
...@@ -13,7 +13,7 @@ describe "Issues" do ...@@ -13,7 +13,7 @@ describe "Issues" do
before do before do
visit project_commit_path(project, commit) visit project_commit_path(project, commit)
fill_in "note_note", :with => "I commented this commit" fill_in "note_note", :with => "I commented this commit"
click_button "Add note" click_button "Add Comment"
end end
it "should conatin new note" do it "should conatin new note" do
......
...@@ -17,7 +17,7 @@ describe "Issues" do ...@@ -17,7 +17,7 @@ describe "Issues" do
before do before do
visit project_issue_path(project, @issue) visit project_issue_path(project, @issue)
fill_in "note_note", :with => "I commented this issue" fill_in "note_note", :with => "I commented this issue"
click_button "Add note" click_button "Add Comment"
end end
it "should conatin new note" do it "should conatin new note" do
......
...@@ -92,10 +92,10 @@ describe "Issues" do ...@@ -92,10 +92,10 @@ describe "Issues" do
select @user.name, :from => "issue_assignee_id" select @user.name, :from => "issue_assignee_id"
end end
it { expect { click_button "Save" }.to change {Issue.count}.by(1) } it { expect { click_button "Submit new issue" }.to change {Issue.count}.by(1) }
it "should add new issue to table" do it "should add new issue to table" do
click_button "Save" click_button "Submit new issue"
page.should_not have_content("Add new issue") page.should_not have_content("Add new issue")
page.should have_content @user.name page.should have_content @user.name
...@@ -105,7 +105,7 @@ describe "Issues" do ...@@ -105,7 +105,7 @@ describe "Issues" do
it "should call send mail" do it "should call send mail" do
Notify.should_not_receive(:new_issue_email) Notify.should_not_receive(:new_issue_email)
click_button "Save" click_button "Submit new issue"
end end
end end
...@@ -116,10 +116,10 @@ describe "Issues" do ...@@ -116,10 +116,10 @@ describe "Issues" do
select @user2.name, :from => "issue_assignee_id" select @user2.name, :from => "issue_assignee_id"
end end
it { expect { click_button "Save" }.to change {Issue.count}.by(1) } it { expect { click_button "Submit new issue" }.to change {Issue.count}.by(1) }
it "should add new issue to table" do it "should add new issue to table" do
click_button "Save" click_button "Submit new issue"
page.should_not have_content("Add new issue") page.should_not have_content("Add new issue")
page.should have_content @user2.name page.should have_content @user2.name
...@@ -129,11 +129,11 @@ describe "Issues" do ...@@ -129,11 +129,11 @@ describe "Issues" do
it "should call send mail" do it "should call send mail" do
Notify.should_receive(:new_issue_email).and_return(stub(:deliver => true)) Notify.should_receive(:new_issue_email).and_return(stub(:deliver => true))
click_button "Save" click_button "Submit new issue"
end end
it "should send valid email to user" do it "should send valid email to user" do
click_button "Save" click_button "Submit new issue"
issue = Issue.last issue = Issue.last
email = ActionMailer::Base.deliveries.last email = ActionMailer::Base.deliveries.last
email.subject.should have_content("New Issue was created") email.subject.should have_content("New Issue was created")
...@@ -177,12 +177,13 @@ describe "Issues" do ...@@ -177,12 +177,13 @@ describe "Issues" do
describe "fill in" do describe "fill in" do
before do before do
fill_in "issue_title", :with => "bug 345" fill_in "issue_title", :with => "bug 345"
fill_in "issue_description", :with => "bug description"
end end
it { expect { click_button "Save" }.to_not change {Issue.count} } it { expect { click_button "Save changes" }.to_not change {Issue.count} }
it "should update issue fields" do it "should update issue fields" do
click_button "Save" click_button "Save changes"
page.should have_content @user.name page.should have_content @user.name
page.should have_content "bug 345" page.should have_content "bug 345"
......
...@@ -23,7 +23,7 @@ describe "Projects", "Wall" do ...@@ -23,7 +23,7 @@ describe "Projects", "Wall" do
before do before do
visit wall_project_path(project) visit wall_project_path(project)
fill_in "note_note", :with => "my post on wall" fill_in "note_note", :with => "my post on wall"
click_button "Add note" click_button "Add Comment"
end end
it "should conatin new note" do it "should conatin new note" 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