diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
commit | 9f46488805e86b1bc341ea1620b866016c2ce5ed (patch) | |
tree | f9748c7e287041e37d6da49e0a29c9511dc34768 /spec/features/projects/snippets | |
parent | dfc92d081ea0332d69c8aca2f0e745cb48ae5e6d (diff) | |
download | gitlab-ce-9f46488805e86b1bc341ea1620b866016c2ce5ed.tar.gz |
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'spec/features/projects/snippets')
-rw-r--r-- | spec/features/projects/snippets/create_snippet_spec.rb | 17 | ||||
-rw-r--r-- | spec/features/projects/snippets/user_updates_snippet_spec.rb | 20 |
2 files changed, 6 insertions, 31 deletions
diff --git a/spec/features/projects/snippets/create_snippet_spec.rb b/spec/features/projects/snippets/create_snippet_spec.rb index d883a1fc39c..1e8f9fa0875 100644 --- a/spec/features/projects/snippets/create_snippet_spec.rb +++ b/spec/features/projects/snippets/create_snippet_spec.rb @@ -5,7 +5,6 @@ require 'spec_helper' shared_examples_for 'snippet editor' do before do stub_feature_flags(snippets_edit_vue: false) - stub_feature_flags(monaco_snippets: flag) end def description_field @@ -20,7 +19,7 @@ shared_examples_for 'snippet editor' do fill_in 'project_snippet_description', with: 'My Snippet **Description**' page.within('.file-editor') do - el = flag == true ? find('.inputarea') : find('.ace_text-input', visible: false) + el = find('.inputarea') el.send_keys 'Hello World!' end end @@ -100,7 +99,7 @@ shared_examples_for 'snippet editor' do end context 'when the git operation fails' do - let(:error) { 'This is a git error' } + let(:error) { 'Error creating the snippet' } before do allow_next_instance_of(Snippets::CreateService) do |instance| @@ -145,15 +144,5 @@ describe 'Projects > Snippets > Create Snippet', :js do 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 + it_behaves_like "snippet editor" end diff --git a/spec/features/projects/snippets/user_updates_snippet_spec.rb b/spec/features/projects/snippets/user_updates_snippet_spec.rb index cf501e55e23..d19fe9e8d38 100644 --- a/spec/features/projects/snippets/user_updates_snippet_spec.rb +++ b/spec/features/projects/snippets/user_updates_snippet_spec.rb @@ -7,12 +7,9 @@ describe 'Projects > Snippets > User updates a snippet', :js do let_it_be(:project) { create(:project, namespace: user.namespace) } let_it_be(:snippet, reload: true) { create(:project_snippet, :repository, project: project, author: user) } - let(:version_snippet_enabled) { true } - before do stub_feature_flags(snippets_vue: false) stub_feature_flags(snippets_edit_vue: false) - stub_feature_flags(version_snippets: version_snippet_enabled) project.add_maintainer(user) sign_in(user) @@ -35,18 +32,6 @@ describe 'Projects > Snippets > User updates a snippet', :js do end end - context 'when feature flag :version_snippets is disabled' do - let(:version_snippet_enabled) { false } - - it 'displays the snippet file_name and content' do - aggregate_failures do - expect(page.find_field('project_snippet_file_name').value).to eq snippet.file_name - expect(page.find('.file-content')).to have_content(snippet.content) - expect(page.find('.snippet-file-content', visible: false).value).to eq snippet.content - end - end - end - it 'updates a snippet' do fill_in('project_snippet_title', with: 'Snippet new title') click_button('Save') @@ -57,16 +42,17 @@ describe 'Projects > Snippets > User updates a snippet', :js do context 'when the git operation fails' do before do allow_next_instance_of(Snippets::UpdateService) do |instance| - allow(instance).to receive(:create_commit).and_raise(StandardError) + allow(instance).to receive(:create_commit).and_raise(StandardError, 'Error Message') end fill_in('project_snippet_title', with: 'Snippet new title') + fill_in('project_snippet_file_name', with: 'new_file_name') click_button('Save') end it 'renders edit page and displays the error' do - expect(page.find('.flash-container span').text).to eq('Error updating the snippet') + expect(page.find('.flash-container span').text).to eq('Error updating the snippet - Error Message') expect(page).to have_content('Edit Snippet') end end |