diff options
Diffstat (limited to 'spec/features/markdown')
-rw-r--r-- | spec/features/markdown/copy_as_gfm_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/markdown/metrics_spec.rb | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/spec/features/markdown/copy_as_gfm_spec.rb b/spec/features/markdown/copy_as_gfm_spec.rb index 80dcdd08f74..57362ed2d54 100644 --- a/spec/features/markdown/copy_as_gfm_spec.rb +++ b/spec/features/markdown/copy_as_gfm_spec.rb @@ -737,6 +737,7 @@ RSpec.describe 'Copy as GFM', :js do context 'inline diff' do before do visit project_commit_path(project, sample_commit.id, view: 'inline') + wait_for_requests end it_behaves_like 'copying code from a diff' @@ -745,6 +746,7 @@ RSpec.describe 'Copy as GFM', :js do context 'parallel diff' do before do visit project_commit_path(project, sample_commit.id, view: 'parallel') + wait_for_requests end it_behaves_like 'copying code from a diff' diff --git a/spec/features/markdown/metrics_spec.rb b/spec/features/markdown/metrics_spec.rb index 3e63ae67f19..9716c660fa9 100644 --- a/spec/features/markdown/metrics_spec.rb +++ b/spec/features/markdown/metrics_spec.rb @@ -18,10 +18,7 @@ RSpec.describe 'Metrics rendering', :js, :kubeclient, :use_clean_rails_memory_st before do clear_host_from_memoized_variables - - allow(::Gitlab.config.gitlab) - .to receive(:url) - .and_return(urls.root_url.chomp('/')) + stub_gitlab_domain project.add_developer(user) sign_in(user) @@ -86,6 +83,7 @@ RSpec.describe 'Metrics rendering', :js, :kubeclient, :use_clean_rails_memory_st y_label: 'Total Cores' } end + let(:metrics_url_2) { urls.metrics_project_environment_url(project, environment, **chart_params_2) } let(:description) { "See [metrics dashboard](#{metrics_url}) for info. \n See [metrics dashboard](#{metrics_url_2}) for info." } let(:issue) { create(:issue, project: project, description: description) } @@ -144,11 +142,11 @@ RSpec.describe 'Metrics rendering', :js, :kubeclient, :use_clean_rails_memory_st { panel_groups: [{ panels: [{ - type: "line-graph", + type: 'area-chart', title: title, - y_label: "metric", + y_label: 'metric', metrics: [{ - query_range: "metric * 0.5 < 1" + query_range: 'metric * 0.5 < 1' }] }] }] |