diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-12-08 22:04:52 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-12-08 22:04:52 +0000 |
| commit | e6668f8e341e422cae752e3371631b50eeb696b2 (patch) | |
| tree | 428ff5903dbd995082a4e6874aacfbd131a02287 /features | |
| parent | 275e8e7309604831485a1f0179f98f41c06f5a8c (diff) | |
| parent | 0f89e6905db6fe821332013e8ddb2707079e0ba4 (diff) | |
| download | gitlab-ce-e6668f8e341e422cae752e3371631b50eeb696b2.tar.gz | |
Merge branch 'edit-in-patch-branch' into 'master'
Default target branch to patch-n when editing file in protected branch
Fixes #3441
See merge request !2021
Diffstat (limited to 'features')
| -rw-r--r-- | features/project/source/browse_files.feature | 6 | ||||
| -rw-r--r-- | features/steps/project/source/browse_files.rb | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/features/project/source/browse_files.feature b/features/project/source/browse_files.feature index 37f99b37619..439787f2641 100644 --- a/features/project/source/browse_files.feature +++ b/features/project/source/browse_files.feature @@ -110,12 +110,6 @@ Feature: Project Source Browse Files Given I visit a binary file in the repo Then I cannot see the edit button - Scenario: If I don't have edit permission the edit link is disabled - Given public project "Community" - And I visit project "Community" source page - And I click on ".gitignore" file in repo - Then The edit button is disabled - @javascript Scenario: I can edit and commit file Given I click on ".gitignore" file in repo diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb index 2792174cc93..f2b95764267 100644 --- a/features/steps/project/source/browse_files.rb +++ b/features/steps/project/source/browse_files.rb @@ -53,10 +53,6 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps expect(page).not_to have_link 'edit' end - step 'The edit button is disabled' do - expect(page).to have_css '.disabled', text: 'Edit' - end - step 'I can edit code' do set_new_content expect(evaluate_script('blob.editor.getValue()')).to eq new_gitignore_content |