diff options
author | Mike Greiling <mike@pixelcog.com> | 2017-10-23 10:32:14 +0300 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2017-10-23 10:32:14 +0300 |
commit | 519ffa1ebf6eff8c7fee1e7aa919b44c1acfeb36 (patch) | |
tree | e2a96f675fbf8fed86568b64723b856ebd5012d9 /features | |
parent | 1e78c627d4c6630df3bbfd4e905018314d692b6d (diff) | |
parent | 5d74973d8148548f505478ed773795d377e6f0d6 (diff) |
Merge branch 'master' into sh-headless-chrome-support
* master: (297 commits)
Fix deletion of container registry or images returning an error
The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This merge requests update the gem to v0.2.0 which contains the fix:
Decrease ABC threshold to 54.28
Update VERSION to 10.2.0-pre
Update CHANGELOG.md for 10.1.0
Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT`
Fix the external URLs generated for online view of HTML artifacts
Use title as placeholder instead of issue title for reusability
Fix failure in current_settings_spec.rb
Clarify the difference between project_update and project_rename
URI decode Page-Title header to preserve UTF-8 characters
Update Gitaly version to v0.49.0
Decrease Perceived Complexity threshold to 14
Resolve "Remove help text regarding group issues on group issues page (and group merge requests page)"
Force non diff resolved discussion to display when collapse toggled
Added submodule support in multi-file editor
add note about after_script being run separately
Check for element before evaluate_script
Merge branch 'master-i18n' into 'master'
Update Prometheus gem to fix problems with other files overwriting current file
...
Diffstat (limited to 'features')
-rw-r--r-- | features/explore/groups.feature | 12 | ||||
-rw-r--r-- | features/steps/project/issues/filter_labels.rb | 6 | ||||
-rw-r--r-- | features/steps/project/source/browse_files.rb | 14 | ||||
-rw-r--r-- | features/steps/shared/paths.rb | 2 |
4 files changed, 14 insertions, 20 deletions
diff --git a/features/explore/groups.feature b/features/explore/groups.feature index 9eacbe0b25e..830810615e0 100644 --- a/features/explore/groups.feature +++ b/features/explore/groups.feature @@ -3,6 +3,7 @@ Feature: Explore Groups Background: Given group "TestGroup" has private project "Enterprise" + @javascript Scenario: I should see group with private and internal projects as user Given group "TestGroup" has internal project "Internal" When I sign in as a user @@ -10,6 +11,7 @@ Feature: Explore Groups Then I should see project "Internal" items And I should not see project "Enterprise" items + @javascript Scenario: I should see group issues for internal project as user Given group "TestGroup" has internal project "Internal" When I sign in as a user @@ -17,6 +19,7 @@ Feature: Explore Groups Then I should see project "Internal" items And I should not see project "Enterprise" items + @javascript Scenario: I should see group merge requests for internal project as user Given group "TestGroup" has internal project "Internal" When I sign in as a user @@ -24,6 +27,7 @@ Feature: Explore Groups Then I should see project "Internal" items And I should not see project "Enterprise" items + @javascript Scenario: I should see group with private, internal and public projects as visitor Given group "TestGroup" has internal project "Internal" Given group "TestGroup" has public project "Community" @@ -32,6 +36,7 @@ Feature: Explore Groups And I should not see project "Internal" items And I should not see project "Enterprise" items + @javascript Scenario: I should see group issues for public project as visitor Given group "TestGroup" has internal project "Internal" Given group "TestGroup" has public project "Community" @@ -40,6 +45,7 @@ Feature: Explore Groups And I should not see project "Internal" items And I should not see project "Enterprise" items + @javascript Scenario: I should see group merge requests for public project as visitor Given group "TestGroup" has internal project "Internal" Given group "TestGroup" has public project "Community" @@ -48,6 +54,7 @@ Feature: Explore Groups And I should not see project "Internal" items And I should not see project "Enterprise" items + @javascript Scenario: I should see group with private, internal and public projects as user Given group "TestGroup" has internal project "Internal" Given group "TestGroup" has public project "Community" @@ -57,6 +64,7 @@ Feature: Explore Groups And I should see project "Internal" items And I should not see project "Enterprise" items + @javascript Scenario: I should see group issues for internal and public projects as user Given group "TestGroup" has internal project "Internal" Given group "TestGroup" has public project "Community" @@ -66,6 +74,7 @@ Feature: Explore Groups And I should see project "Internal" items And I should not see project "Enterprise" items + @javascript Scenario: I should see group merge requests for internal and public projects as user Given group "TestGroup" has internal project "Internal" Given group "TestGroup" has public project "Community" @@ -75,17 +84,20 @@ Feature: Explore Groups And I should see project "Internal" items And I should not see project "Enterprise" items + @javascript Scenario: I should see group with public project in public groups area Given group "TestGroup" has public project "Community" When I visit the public groups area Then I should see group "TestGroup" + @javascript Scenario: I should see group with public project in public groups area as user Given group "TestGroup" has public project "Community" When I sign in as a user And I visit the public groups area Then I should see group "TestGroup" + @javascript Scenario: I should see group with internal project in public groups area as user Given group "TestGroup" has internal project "Internal" When I sign in as a user diff --git a/features/steps/project/issues/filter_labels.rb b/features/steps/project/issues/filter_labels.rb index d34fa694789..b467af53c98 100644 --- a/features/steps/project/issues/filter_labels.rb +++ b/features/steps/project/issues/filter_labels.rb @@ -28,12 +28,6 @@ class Spinach::Features::ProjectIssuesFilterLabels < Spinach::FeatureSteps end end - step 'I click link "bug"' do - page.find('.js-label-select', visible: true).click - sleep 0.5 - execute_script("$('.dropdown-menu-labels li:contains(\"bug\") a').click()") - end - step 'I click "dropdown close button"' do page.first('.labels-filter .dropdown-title .dropdown-menu-close-icon').click sleep 2 diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb index 621cae5d80d..6e04f09f322 100644 --- a/features/steps/project/source/browse_files.rb +++ b/features/steps/project/source/browse_files.rb @@ -46,10 +46,6 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps expect(page).to have_content new_gitignore_content end - step 'I should see its content with new lines preserved at end of file' do - expect(evaluate_script('ace.edit("editor").getValue()')).to eq "Sample\n\n\n" - end - step 'I click link "Raw"' do click_link 'Open raw' end @@ -70,20 +66,11 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps click_link 'Fork' end - step 'I can edit code' do - set_new_content - expect(evaluate_script('ace.edit("editor").getValue()')).to eq new_gitignore_content - end - step 'I edit code' do expect(page).to have_selector('.file-editor') set_new_content end - step 'I edit code with new lines at end of file' do - execute_script('ace.edit("editor").setValue("Sample\n\n\n")') - end - step 'I fill the new file name' do fill_in :file_name, with: new_file_name end @@ -395,6 +382,7 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps private def set_new_content + find('#editor') execute_script("ace.edit('editor').setValue('#{new_gitignore_content}')") end diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb index dc0e3ac59a5..bff0d58aaf4 100644 --- a/features/steps/shared/paths.rb +++ b/features/steps/shared/paths.rb @@ -222,7 +222,7 @@ module SharedPaths end step "I visit my project's commits page for a specific path" do - visit project_commits_path(@project, root_ref + "/app/models/project.rb", { limit: 5 }) + visit project_commits_path(@project, root_ref + "/files/ruby/regex.rb", { limit: 5 }) end step 'I visit my project\'s commits stats page' do |