diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-02 21:06:51 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-02 21:06:51 +0000 |
| commit | a19a376bf35b2009566e86b8190662c21ed7e2ba (patch) | |
| tree | 46d3ea7f44a0a732b96fcbae0cf09d3cfd8ec9dc /qa | |
| parent | 556c79d6cc3d7b24ecbba3a79f8432eb3fcf5c7e (diff) | |
| download | gitlab-ce-a19a376bf35b2009566e86b8190662c21ed7e2ba.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/qa/page/mattermost/main.rb | 5 | ||||
| -rw-r--r-- | qa/qa/page/project/settings/deploy_keys.rb | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/qa/qa/page/mattermost/main.rb b/qa/qa/page/mattermost/main.rb index e531ace8529..eea5c4b527e 100644 --- a/qa/qa/page/mattermost/main.rb +++ b/qa/qa/page/mattermost/main.rb @@ -4,11 +4,6 @@ module QA module Page module Mattermost class Main < Page::Base - ## - # TODO, define all selectors required by this page object - # - # See gitlab-org/gitlab-qa#154 - # view 'app/views/projects/mattermosts/new.html.haml' def initialize diff --git a/qa/qa/page/project/settings/deploy_keys.rb b/qa/qa/page/project/settings/deploy_keys.rb index b8d961274a9..602bfc64710 100644 --- a/qa/qa/page/project/settings/deploy_keys.rb +++ b/qa/qa/page/project/settings/deploy_keys.rb @@ -12,7 +12,7 @@ module QA view 'app/assets/javascripts/deploy_keys/components/app.vue' do element :deploy_keys_section, /class=".*deploy\-keys.*"/ # rubocop:disable QA/ElementWithPattern - element :project_deploy_keys, 'class="qa-project-deploy-keys"' # rubocop:disable QA/ElementWithPattern + element :project_deploy_keys end view 'app/assets/javascripts/deploy_keys/components/key.vue' do |