Rspec test repo replaced.\nMerge Requests improved
This commit is contained in:
parent
781f5aa6fb
commit
3676838dc9
18 changed files with 90 additions and 41 deletions
|
@ -87,7 +87,7 @@ describe "Admin::Projects" do
|
|||
visit new_admin_project_path
|
||||
fill_in 'Name', :with => 'NewProject'
|
||||
fill_in 'Code', :with => 'NPR'
|
||||
fill_in 'Path', :with => 'legit_1'
|
||||
fill_in 'Path', :with => 'gitlabhq_1'
|
||||
expect { click_button "Save" }.to change { Project.count }.by(1)
|
||||
@project = Project.last
|
||||
end
|
||||
|
|
|
@ -52,7 +52,7 @@ describe "MergeRequests" do
|
|||
visit new_project_merge_request_path(project)
|
||||
fill_in "merge_request_title", :with => "Merge Request Title"
|
||||
select "master", :from => "merge_request_source_branch"
|
||||
select "master", :from => "merge_request_target_branch"
|
||||
select "stable", :from => "merge_request_target_branch"
|
||||
select @user.name, :from => "merge_request_assignee_id"
|
||||
click_button "Save"
|
||||
end
|
||||
|
|
|
@ -134,7 +134,7 @@ describe "Projects" do
|
|||
visit edit_project_path(@project)
|
||||
|
||||
fill_in 'Name', :with => 'Awesome'
|
||||
fill_in 'Path', :with => 'legit'
|
||||
fill_in 'Path', :with => 'gitlabhq'
|
||||
fill_in 'Description', :with => 'Awesome project'
|
||||
click_button "Save"
|
||||
@project = @project.reload
|
||||
|
|
|
@ -57,7 +57,7 @@ describe "Projects" do
|
|||
@project = Factory :project
|
||||
@project.add_access(@user, :read)
|
||||
|
||||
visit tree_project_ref_path(@project, @project.root_ref, :path => ".rvmrc")
|
||||
visit tree_project_ref_path(@project, @project.root_ref, :path => "Gemfile")
|
||||
end
|
||||
|
||||
it "should be correct path" do
|
||||
|
@ -65,7 +65,7 @@ describe "Projects" do
|
|||
end
|
||||
|
||||
it "should contain file view" do
|
||||
page.should have_content("rvm use 1.9.2@legit")
|
||||
page.should have_content("rubygems.org")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -42,7 +42,7 @@ describe "Repository" do
|
|||
|
||||
it "should have link to repo activities" do
|
||||
page.should have_content("Tags")
|
||||
page.should have_content("No tags")
|
||||
page.should have_content("v1.2.1")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue