diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-14 06:06:26 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-14 06:06:26 +0000 |
| commit | d9251dac4c8f9e27f1e2db4b537d47d7d5a9e5be (patch) | |
| tree | a57ef4e98f815acc864bfd523e1436d3774fa05a /qa | |
| parent | 29c01c6c91558358c37ba45b03f240632bfb918d (diff) | |
| download | gitlab-ce-d9251dac4c8f9e27f1e2db4b537d47d7d5a9e5be.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/Gemfile | 7 | ||||
| -rw-r--r-- | qa/Gemfile.lock | 9 | ||||
| -rw-r--r-- | qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb | 2 |
3 files changed, 15 insertions, 3 deletions
diff --git a/qa/Gemfile b/qa/Gemfile index f04ecb13879..90a2c6e5b8b 100644 --- a/qa/Gemfile +++ b/qa/Gemfile @@ -2,7 +2,6 @@ source 'https://rubygems.org' gem 'gitlab-qa' gem 'activesupport', '5.2.3' # This should stay in sync with the root's Gemfile -gem 'pry-byebug', '~> 3.5.1', platform: :mri gem 'capybara', '~> 2.16.1' gem 'capybara-screenshot', '~> 1.0.18' gem 'rake', '~> 12.3.0' @@ -15,3 +14,9 @@ gem 'rspec_junit_formatter', '~> 0.4.1' gem 'faker', '~> 1.6', '>= 1.6.6' gem 'knapsack', '~> 1.17' gem 'parallel_tests', '~> 2.29' + +group :test do + gem 'pry-byebug', '~> 3.5.1', platform: :mri + gem "ruby-debug-ide", "~> 0.7.0" + gem "debase", "~> 0.2.4.1" +end diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock index d582d77c5cd..6728c0cceee 100644 --- a/qa/Gemfile.lock +++ b/qa/Gemfile.lock @@ -29,6 +29,9 @@ GEM ffi (~> 1.0, >= 1.0.11) coderay (1.1.2) concurrent-ruby (1.1.5) + debase (0.2.4.1) + debase-ruby_core_source (>= 0.10.2) + debase-ruby_core_source (0.10.6) diff-lcs (1.3) domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) @@ -67,7 +70,7 @@ GEM rack (2.0.6) rack-test (0.8.2) rack (>= 1.0, < 3) - rake (12.3.0) + rake (12.3.3) rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) @@ -89,6 +92,8 @@ GEM rspec-support (3.7.0) rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) + ruby-debug-ide (0.7.0) + rake (>= 0.8.1) rubyzip (1.2.2) selenium-webdriver (3.141.0) childprocess (~> 0.5) @@ -110,6 +115,7 @@ DEPENDENCIES airborne (~> 0.2.13) capybara (~> 2.16.1) capybara-screenshot (~> 1.0.18) + debase (~> 0.2.4.1) faker (~> 1.6, >= 1.6.6) gitlab-qa knapsack (~> 1.17) @@ -120,6 +126,7 @@ DEPENDENCIES rspec (~> 3.7) rspec-retry (~> 0.6.1) rspec_junit_formatter (~> 0.4.1) + ruby-debug-ide (~> 0.7.0) selenium-webdriver (~> 3.12) BUNDLED WITH diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb index 6068b9fb04a..35cd64aa58e 100644 --- a/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb +++ b/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb @@ -42,7 +42,7 @@ module QA Page::Project::Issue::Show.perform do |show| show.select_all_activities_filter - show.comment('cc-ing you here @eve') + show.comment("cc-ing you here @#{user.username}") expect do expect(show).to have_content("cc-ing you here") |