diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-28 15:09:13 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-28 15:09:13 +0000 |
commit | 736d36d8597d0d1ec1b47644e6d091c3f4a78f45 (patch) | |
tree | a38f6fef2b7147416b31f8294a9389b3bb472c87 /spec/features | |
parent | 5426ca9908085087d465fa52800335f408eb965a (diff) | |
download | gitlab-ce-736d36d8597d0d1ec1b47644e6d091c3f4a78f45.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/projects/snippets/create_snippet_spec.rb | 32 | ||||
-rw-r--r-- | spec/features/snippets/spam_snippets_spec.rb | 24 | ||||
-rw-r--r-- | spec/features/snippets/user_creates_snippet_spec.rb | 31 |
3 files changed, 70 insertions, 17 deletions
diff --git a/spec/features/projects/snippets/create_snippet_spec.rb b/spec/features/projects/snippets/create_snippet_spec.rb index 40c54b2f873..ee312a5811d 100644 --- a/spec/features/projects/snippets/create_snippet_spec.rb +++ b/spec/features/projects/snippets/create_snippet_spec.rb @@ -2,11 +2,10 @@ require 'spec_helper' -describe 'Projects > Snippets > Create Snippet', :js do - include DropzoneHelper - - let_it_be(:user) { create(:user) } - let_it_be(:project) { create(:project, :public) } +shared_examples_for 'snippet editor' do + before do + stub_feature_flags(monaco_snippets: flag) + end def description_field find('.js-description-input').find('input,textarea') @@ -20,7 +19,8 @@ describe 'Projects > Snippets > Create Snippet', :js do fill_in 'project_snippet_description', with: 'My Snippet **Description**' page.within('.file-editor') do - find('.ace_text-input', visible: false).send_keys('Hello World!') + el = flag == true ? find('.inputarea') : find('.ace_text-input', visible: false) + el.send_keys 'Hello World!' end end @@ -33,6 +33,7 @@ describe 'Projects > Snippets > Create Snippet', :js do visit project_snippets_path(project) click_on('New snippet') + wait_for_requests end it 'shows collapsible description input' do @@ -111,3 +112,22 @@ describe 'Projects > Snippets > Create Snippet', :js do end end end + +describe 'Projects > Snippets > Create Snippet', :js do + include DropzoneHelper + + let_it_be(:user) { create(:user) } + let_it_be(:project) { create(:project, :public) } + + context 'when using Monaco' do + it_behaves_like "snippet editor" do + let(:flag) { true } + end + end + + context 'when using ACE' do + it_behaves_like "snippet editor" do + let(:flag) { false } + end + end +end diff --git a/spec/features/snippets/spam_snippets_spec.rb b/spec/features/snippets/spam_snippets_spec.rb index 02b807ce071..efe1bdc963d 100644 --- a/spec/features/snippets/spam_snippets_spec.rb +++ b/spec/features/snippets/spam_snippets_spec.rb @@ -2,9 +2,7 @@ require 'spec_helper' -describe 'User creates snippet', :js do - let(:user) { create(:user) } - +shared_examples_for 'snippet editor' do def description_field find('.js-description-input').find('input,textarea') end @@ -12,6 +10,7 @@ describe 'User creates snippet', :js do before do stub_feature_flags(allow_possible_spam: false) stub_feature_flags(snippets_vue: false) + stub_feature_flags(monaco_snippets: flag) stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false') Gitlab::CurrentSettings.update!( @@ -33,7 +32,8 @@ describe 'User creates snippet', :js do find('#personal_snippet_visibility_level_20').set(true) page.within('.file-editor') do - find('.ace_text-input', visible: false).send_keys 'Hello World!' + el = flag == true ? find('.inputarea') : find('.ace_text-input', visible: false) + el.send_keys 'Hello World!' end end @@ -80,3 +80,19 @@ describe 'User creates snippet', :js do end end end + +describe 'User creates snippet', :js do + let_it_be(:user) { create(:user) } + + context 'when using Monaco' do + it_behaves_like "snippet editor" do + let(:flag) { true } + end + end + + context 'when using ACE' do + it_behaves_like "snippet editor" do + let(:flag) { false } + end + end +end diff --git a/spec/features/snippets/user_creates_snippet_spec.rb b/spec/features/snippets/user_creates_snippet_spec.rb index 69a44513e7f..88f7896bfa6 100644 --- a/spec/features/snippets/user_creates_snippet_spec.rb +++ b/spec/features/snippets/user_creates_snippet_spec.rb @@ -2,13 +2,10 @@ require 'spec_helper' -describe 'User creates snippet', :js do - include DropzoneHelper - - let(:user) { create(:user) } - +shared_examples_for 'snippet editor' do before do stub_feature_flags(snippets_vue: false) + stub_feature_flags(monaco_snippets: flag) sign_in(user) visit new_snippet_path end @@ -25,7 +22,8 @@ describe 'User creates snippet', :js do fill_in 'personal_snippet_description', with: 'My Snippet **Description**' page.within('.file-editor') do - find('.ace_text-input', visible: false).send_keys 'Hello World!' + el = flag == true ? find('.inputarea') : find('.ace_text-input', visible: false) + el.send_keys 'Hello World!' end end @@ -109,7 +107,8 @@ describe 'User creates snippet', :js do fill_in 'personal_snippet_title', with: 'My Snippet Title' page.within('.file-editor') do find(:xpath, "//input[@id='personal_snippet_file_name']").set 'snippet+file+name' - find('.ace_text-input', visible: false).send_keys 'Hello World!' + el = flag == true ? find('.inputarea') : find('.ace_text-input', visible: false) + el.send_keys 'Hello World!' end click_button 'Create snippet' @@ -120,3 +119,21 @@ describe 'User creates snippet', :js do expect(page).to have_content('Hello World!') end end + +describe 'User creates snippet', :js do + include DropzoneHelper + + let_it_be(:user) { create(:user) } + + context 'when using Monaco' do + it_behaves_like "snippet editor" do + let(:flag) { true } + end + end + + context 'when using ACE' do + it_behaves_like "snippet editor" do + let(:flag) { false } + end + end +end |