diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-04 21:45:30 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-04 21:45:30 +0200 |
commit | ef5b36eaaf92db19ae90cc599c3f64b865bdc4d5 (patch) | |
tree | 4dd03fbf865b82a93cdec1f5d9d44c6b1d211d02 /features | |
parent | afbdbb0c959affbdb8725eafb8169025a8aede1e (diff) | |
download | gitlab-ce-ef5b36eaaf92db19ae90cc599c3f64b865bdc4d5.tar.gz |
Fixed protected branches and file edit
Diffstat (limited to 'features')
-rw-r--r-- | features/steps/project/create_project.rb | 4 | ||||
-rw-r--r-- | features/steps/project/project_browse_commits.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/features/steps/project/create_project.rb b/features/steps/project/create_project.rb index b9b4534ed68..0d9727732c7 100644 --- a/features/steps/project/create_project.rb +++ b/features/steps/project/create_project.rb @@ -3,13 +3,13 @@ class CreateProject < Spinach::FeatureSteps include SharedPaths And 'fill project form with valid data' do - fill_in 'project_name', :with => 'NewProject' + fill_in 'project_name', with: 'Empty' click_button "Create project" end Then 'I should see project page' do current_path.should == project_path(Project.last) - page.should have_content "NewProject" + page.should have_content "Empty" end And 'I should see empty project instuctions' do diff --git a/features/steps/project/project_browse_commits.rb b/features/steps/project/project_browse_commits.rb index aef1d048349..3433c2ba5f6 100644 --- a/features/steps/project/project_browse_commits.rb +++ b/features/steps/project/project_browse_commits.rb @@ -48,7 +48,7 @@ class ProjectBrowseCommits < Spinach::FeatureSteps page.should have_selector('ul.breadcrumb span.divider', count: 3) page.should have_selector('ul.breadcrumb a', count: 4) - find('ul.breadcrumb li:first a')['href'].should match(/#{@project.path}\/commits\/master\z/) + find('ul.breadcrumb li:first a')['href'].should match(/#{@project.path_with_namespace}\/commits\/master\z/) find('ul.breadcrumb li:last a')['href'].should match(%r{master/app/models/project\.rb\z}) end |