summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-02-23 12:03:03 +0100
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-01-31 22:55:30 +0000
commit639cf728f8c14560e85e0f54d5f4f27329d98c3c (patch)
tree39fa7b8605c0c2848f7e81fd6ad7474faef57997 /features
parent5556db04040c8c97834728dcf0fb26d2ea2c9a16 (diff)
downloadgitlab-ce-639cf728f8c14560e85e0f54d5f4f27329d98c3c.tar.gz
Fix adding pages domain to projects in groups
Diffstat (limited to 'features')
-rw-r--r--features/project/pages.feature9
-rw-r--r--features/steps/shared/project.rb6
2 files changed, 15 insertions, 0 deletions
diff --git a/features/project/pages.feature b/features/project/pages.feature
index 392f2d29c3c..87d88348d09 100644
--- a/features/project/pages.feature
+++ b/features/project/pages.feature
@@ -40,6 +40,15 @@ Feature: Project Pages
And I click on "Create New Domain"
Then I should see a new domain added
+ Scenario: I should be able to add a new domain for project in group namespace
+ Given I own a project in some group namespace
+ And pages are enabled
+ And pages are exposed on external HTTP address
+ When I visit add a new Pages Domain
+ And I fill the domain
+ And I click on "Create New Domain"
+ Then I should see a new domain added
+
Scenario: I should be denied to add the same domain twice
Given pages are enabled
And pages are exposed on external HTTP address
diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb
index 7a6707a7dfb..dae248b8b7e 100644
--- a/features/steps/shared/project.rb
+++ b/features/steps/shared/project.rb
@@ -7,6 +7,12 @@ module SharedProject
@project.team << [@user, :master]
end
+ step "I own a project in some group namespace" do
+ @group = create(:group, name: 'some group')
+ @project = create(:project, namespace: @group)
+ @project.team << [@user, :master]
+ end
+
step "project exists in some group namespace" do
@group = create(:group, name: 'some group')
@project = create(:project, :repository, namespace: @group, public_builds: false)