Skip to content
Snippets Groups Projects
Commit 7a9fc480 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

just test fix commit

parent d9cfb798
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -38,6 +38,7 @@ Factory.add(:merge_request, MergeRequest) do |obj|
obj.title = Faker::Lorem.sentence
obj.source_branch = "master"
obj.target_branch = "master"
obj.closed = false
end
 
Factory.add(:snippet, Snippet) do |obj|
Loading
Loading
require 'spec_helper'
 
describe "User Issues Dashboard", :js => true do
describe "User Issues Dashboard" do
describe "GET /issues" do
before do
 
Loading
Loading
@@ -27,8 +27,7 @@ describe "User Issues Dashboard", :js => true do
:assignee => @user,
:project => @project2
 
visit dashboard_path
click_link "issues_slide"
visit dashboard_issues_path
end
 
subject { page }
Loading
Loading
require 'spec_helper'
 
describe "User MergeRequests", :js => true do
describe "User MergeRequests" do
describe "GET /issues" do
before do
 
Loading
Loading
@@ -27,19 +27,18 @@ describe "User MergeRequests", :js => true do
:assignee => @user,
:project => @project2
 
visit dashboard_path
click_link "merge_requests_slide"
visit dashboard_merge_requests_path
end
 
subject { page }
 
it { should have_content(@merge_request1.title) }
it { should have_content(@merge_request1.title[0..10]) }
it { should have_content(@merge_request1.project.name) }
it { should have_content(@merge_request1.target_branch) }
it { should have_content(@merge_request1.source_branch) }
it { should have_content(@merge_request1.assignee.name) }
 
it { should have_content(@merge_request2.title) }
it { should have_content(@merge_request2.title[0..10]) }
it { should have_content(@merge_request2.project.name) }
it { should have_content(@merge_request2.target_branch) }
it { should have_content(@merge_request2.source_branch) }
Loading
Loading
Loading
Loading
@@ -46,7 +46,7 @@ describe "Projects" do
fill_in 'Name', :with => 'NewProject'
fill_in 'Code', :with => 'NPR'
fill_in 'Path', :with => 'newproject'
expect { click_button "Create Project" }.to change { Project.count }.by(1)
expect { click_button "Save" }.to change { Project.count }.by(1)
@project = Project.last
end
 
Loading
Loading
@@ -135,7 +135,7 @@ describe "Projects" do
fill_in 'Name', :with => 'Awesome'
fill_in 'Path', :with => 'legit'
fill_in 'Description', :with => 'Awesome project'
click_button "Update Project"
click_button "Save"
@project = @project.reload
end
 
Loading
Loading
Loading
Loading
@@ -28,7 +28,7 @@ describe "Snippets" do
# admin access to remove snippet
@user.users_projects.destroy_all
project.add_access(@user, :read, :write, :admin)
visit project_snippets_path(project)
visit edit_project_snippet_path(project, @snippet)
end
 
it "should remove entry" do
Loading
Loading
@@ -72,8 +72,8 @@ describe "Snippets" do
@snippet = Factory :snippet,
:author => @user,
:project => project
visit project_snippets_path(project)
click_link "Edit"
visit project_snippet_path(project, @snippet)
click_link "Edit Snippet"
end
 
it "should open edit page" do
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