Skip to content
Snippets Groups Projects
Commit 5e12f10c authored by gitlabhq's avatar gitlabhq
Browse files

fixes

parent 82d16ccf
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -10,7 +10,10 @@
<%= current_user.name %>
<% end %>
<%= link_to 'Logout', destroy_user_session_path, :class => "logout", :method => :delete %>
</div>
</div>
<div class="search">
<%= text_field_tag "search", nil, :placeholder => "Search", :class => "search-input" %>
</div>
<!-- .login-top -->
<nav>
<%= link_to root_path, :class => current_page?(root_path) ? "current dashboard" : "dashboard" do %>
Loading
Loading
@@ -31,7 +34,6 @@
<div class="span-24">
<div class="span-10">
<span class="search-holder">
<%= text_field_tag "search", nil, :placeholder => "Search" %>
</span>
</div>
<div class="right">
Loading
Loading
Loading
Loading
@@ -11,6 +11,5 @@
REQ_URI = "#{request.env["REQUEST_URI"]}";
REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
%body.login-page
#container
= render :partial => "layouts/flash"
= render :partial => "layouts/flash"
= yield
Loading
Loading
@@ -5,7 +5,10 @@ describe "Issues" do
 
before do
login_as :user
@user2 = Factory :user
project.add_access(@user, :read, :write)
project.add_access(@user2, :read, :write)
end
 
describe "GET /issues" do
Loading
Loading
@@ -49,20 +52,20 @@ describe "Issues" do
end
 
it "should show only open" do
should have_content(@issue.title)
should have_content(@issue.title[0..25])
should have_no_content(@closed_issue.title)
end
 
it "should show only closed" do
choose "closed_issues"
should have_no_content(@issue.title)
should have_content(@closed_issue.title)
should have_content(@closed_issue.title[0..25])
end
 
it "should show all" do
choose "all_issues"
should have_content(@issue.title)
should have_content(@closed_issue.title)
should have_content(@issue.title[0..25])
should have_content(@closed_issue.title[0..25])
end
end
end
Loading
Loading
@@ -78,35 +81,71 @@ describe "Issues" do
end
 
describe "fill in" do
before do
fill_in "issue_title", :with => "bug 345"
click_link "Select user"
click_link @user.name
end
it { expect { click_button "Save" }.to change {Issue.count}.by(1) }
it "should add new issue to table" do
click_button "Save"
page.should_not have_content("Add new issue")
page.should have_content @user.name
page.should have_content "bug 345"
page.should have_content project.name
describe 'assign to me' do
before do
fill_in "issue_title", :with => "bug 345"
click_link "Select user"
within "#issue_assignee_id-menu" do
click_link @user.name
end
end
it { expect { click_button "Save" }.to change {Issue.count}.by(1) }
it "should add new issue to table" do
click_button "Save"
page.should_not have_content("Add new issue")
page.should have_content @user.name
page.should have_content "bug 345"
page.should have_content project.name
end
it "should call send mail" do
Notify.should_not_receive(:new_issue_email)
click_button "Save"
end
it "should send valid email to user with email & password" do
click_button "Save"
ActionMailer::Base.deliveries.last.should be_nil
end
end
 
it "should call send mail" do
Notify.should_receive(:new_issue_email).and_return(stub(:deliver => true))
click_button "Save"
end
describe 'assign to other' do
before do
fill_in "issue_title", :with => "bug 345"
click_link "Select user"
within "#issue_assignee_id-menu" do
click_link @user2.name
end
end
it { expect { click_button "Save" }.to change {Issue.count}.by(1) }
it "should add new issue to table" do
click_button "Save"
page.should_not have_content("Add new issue")
page.should have_content @user2.name
page.should have_content "bug 345"
page.should have_content project.name
end
it "should call send mail" do
Notify.should_receive(:new_issue_email).and_return(stub(:deliver => true))
click_button "Save"
end
it "should send valid email to user with email & password" do
click_button "Save"
issue = Issue.last
email = ActionMailer::Base.deliveries.last
email.subject.should have_content("New Issue was created")
email.body.should have_content(issue.title)
email.body.should have_content(issue.assignee.name)
end
 
it "should send valid email to user with email & password" do
click_button "Save"
issue = Issue.last
email = ActionMailer::Base.deliveries.last
email.subject.should have_content("New Issue was created")
email.body.should have_content(issue.title)
email.body.should have_content(issue.assignee.name)
end
end
end
Loading
Loading
Loading
Loading
@@ -13,14 +13,14 @@ describe "Projects" do
end
 
it "should have link to new project" do
page.should have_content("New Project")
page.should have_content("Create new project")
end
end
 
describe "GET /projects/new" do
before do
visit projects_path
click_link "New Project"
click_link "Create new project"
end
 
it "should be correct path" do
Loading
Loading
Loading
Loading
@@ -12,15 +12,15 @@ module LoginMacros
end
 
visit new_user_session_path
fill_in "Email", :with => @user.email
fill_in "Password", :with => "123456"
fill_in "user_email", :with => @user.email
fill_in "user_password", :with => "123456"
click_button "Sign in"
end
 
def login_with(user)
visit new_user_session_path
fill_in "Email", :with => user.email
fill_in "Password", :with => "123456"
fill_in "user_email", :with => user.email
fill_in "user_password", :with => "123456"
click_button "Sign in"
end
 
Loading
Loading
Loading
Loading
@@ -445,7 +445,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
* http://docs.jquery.com/UI/Dialog#theming
*/
.ui-dialog { position: absolute; padding: 0; width: 300px; overflow: hidden; }
.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative; background: #333; color:#eaeaea }
.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative; background: #F7F7F7; color:#555; }
.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0;}
.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; background:#eaeaea}
.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment