summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-02-16 10:48:51 +0100
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-01-31 22:53:58 +0000
commit4d2337175872217eb22f035c3fcd981a38e8a374 (patch)
tree7c52b9f500ae14dd0a1b2e870f3b2ddbaeff629e /features
parent361047a7911dbf5da3c33aefa5c77a43621e5514 (diff)
downloadgitlab-ce-4d2337175872217eb22f035c3fcd981a38e8a374.tar.gz
Final fixes
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/pages.rb22
1 files changed, 11 insertions, 11 deletions
diff --git a/features/steps/project/pages.rb b/features/steps/project/pages.rb
index a5cb81b0ef3..ac44aac9e38 100644
--- a/features/steps/project/pages.rb
+++ b/features/steps/project/pages.rb
@@ -4,14 +4,14 @@ class Spinach::Features::ProjectPages < Spinach::FeatureSteps
include SharedProject
step 'pages are enabled' do
- Gitlab.config.pages.stub(:enabled).and_return(true)
- Gitlab.config.pages.stub(:host).and_return('example.com')
- Gitlab.config.pages.stub(:port).and_return(80)
- Gitlab.config.pages.stub(:https).and_return(false)
+ allow(Gitlab.config.pages).to receive(:enabled).and_return(true)
+ allow(Gitlab.config.pages).to receive(:host).and_return('example.com')
+ allow(Gitlab.config.pages).to receive(:port).and_return(80)
+ allow(Gitlab.config.pages).to receive(:https).and_return(false)
end
step 'pages are disabled' do
- Gitlab.config.pages.stub(:enabled).and_return(false)
+ allow(Gitlab.config.pages).to receive(:enabled).and_return(false)
end
step 'I visit the Project Pages' do
@@ -48,18 +48,18 @@ class Spinach::Features::ProjectPages < Spinach::FeatureSteps
end
step 'support for external domains is disabled' do
- Gitlab.config.pages.stub(:external_http).and_return(nil)
- Gitlab.config.pages.stub(:external_https).and_return(nil)
+ allow(Gitlab.config.pages).to receive(:external_http).and_return(nil)
+ allow(Gitlab.config.pages).to receive(:external_https).and_return(nil)
end
step 'pages are exposed on external HTTP address' do
- Gitlab.config.pages.stub(:external_http).and_return('1.1.1.1:80')
- Gitlab.config.pages.stub(:external_https).and_return(nil)
+ allow(Gitlab.config.pages).to receive(:external_http).and_return('1.1.1.1:80')
+ allow(Gitlab.config.pages).to receive(:external_https).and_return(nil)
end
step 'pages are exposed on external HTTPS address' do
- Gitlab.config.pages.stub(:external_http).and_return('1.1.1.1:80')
- Gitlab.config.pages.stub(:external_https).and_return('1.1.1.1:443')
+ allow(Gitlab.config.pages).to receive(:external_http).and_return('1.1.1.1:80')
+ allow(Gitlab.config.pages).to receive(:external_https).and_return('1.1.1.1:443')
end
step 'I should be able to add a New Domain' do