summaryrefslogtreecommitdiff
path: root/spec/features/projects/services
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-08-09 15:57:52 -0700
committerStan Hu <stanhu@gmail.com>2017-08-09 15:57:52 -0700
commit09baadca349670822645b56a17e9bf8716e997b6 (patch)
tree397bb26f3a0e851b39c57351cbe6963adc47dea8 /spec/features/projects/services
parentded77e21b38dbb65aec2aeae42de02e6571fe01a (diff)
parent2925850ceec3ef89eb1f60b0a648dbc5f72d8683 (diff)
downloadgitlab-ce-09baadca349670822645b56a17e9bf8716e997b6.tar.gz
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to 'spec/features/projects/services')
-rw-r--r--spec/features/projects/services/jira_service_spec.rb2
-rw-r--r--spec/features/projects/services/mattermost_slash_command_spec.rb2
-rw-r--r--spec/features/projects/services/slack_service_spec.rb2
-rw-r--r--spec/features/projects/services/slack_slash_command_spec.rb2
4 files changed, 4 insertions, 4 deletions
diff --git a/spec/features/projects/services/jira_service_spec.rb b/spec/features/projects/services/jira_service_spec.rb
index 645713d0805..b6df3212f3d 100644
--- a/spec/features/projects/services/jira_service_spec.rb
+++ b/spec/features/projects/services/jira_service_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Setup Jira service', :js do
let(:user) { create(:user) }
- let(:project) { create(:empty_project) }
+ let(:project) { create(:project) }
let(:service) { project.create_jira_service }
let(:url) { 'http://jira.example.com' }
diff --git a/spec/features/projects/services/mattermost_slash_command_spec.rb b/spec/features/projects/services/mattermost_slash_command_spec.rb
index 134d7e5e8b7..95d5e8b14b9 100644
--- a/spec/features/projects/services/mattermost_slash_command_spec.rb
+++ b/spec/features/projects/services/mattermost_slash_command_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Setup Mattermost slash commands', :js do
let(:user) { create(:user) }
- let(:project) { create(:empty_project) }
+ let(:project) { create(:project) }
let(:service) { project.create_mattermost_slash_commands_service }
let(:mattermost_enabled) { true }
diff --git a/spec/features/projects/services/slack_service_spec.rb b/spec/features/projects/services/slack_service_spec.rb
index 824cae261e0..c10ec5e2987 100644
--- a/spec/features/projects/services/slack_service_spec.rb
+++ b/spec/features/projects/services/slack_service_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
feature 'Projects > Slack service > Setup events' do
let(:user) { create(:user) }
let(:service) { SlackService.new }
- let(:project) { create(:empty_project, slack_service: service) }
+ let(:project) { create(:project, slack_service: service) }
background do
service.fields
diff --git a/spec/features/projects/services/slack_slash_command_spec.rb b/spec/features/projects/services/slack_slash_command_spec.rb
index 6002c589fba..a8baf126269 100644
--- a/spec/features/projects/services/slack_slash_command_spec.rb
+++ b/spec/features/projects/services/slack_slash_command_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Slack slash commands' do
given(:user) { create(:user) }
- given(:project) { create(:empty_project) }
+ given(:project) { create(:project) }
given(:service) { project.create_slack_slash_commands_service }
background do