summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-26 14:42:15 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-26 14:42:15 +0000
commitb23025b669d7451cfc8c6b55430a8c701022d7b3 (patch)
treef9a4888247274ff9bf33cdd91e5bef0248917fc3 /features
parent08102ad7485cd2cdbcba0cc3b0e2ced3de6be5fe (diff)
parent11af51613d219aecd2a8cdce879d983f82434d47 (diff)
downloadgitlab-ce-b23025b669d7451cfc8c6b55430a8c701022d7b3.tar.gz
Merge branch 'rs-gems' into 'master'
Update ffaker gem Adds a version requirement which it didn't have before, at 2.0.0. This version has breaking API changes in that the namespace is now `FFaker` instead of `Faker`. Prior, if a new developer checked out the repo, ran `bundle install` and then tried `rake dev:setup`, seeding would fail due to having the latest version of ffaker without the API changes in this MR. Also updates `spring` version and the binstubs, just for kicks. See merge request !686
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/hooks.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/features/steps/project/hooks.rb b/features/steps/project/hooks.rb
index 4b135202593..d06905285fe 100644
--- a/features/steps/project/hooks.rb
+++ b/features/steps/project/hooks.rb
@@ -23,7 +23,7 @@ class Spinach::Features::ProjectHooks < Spinach::FeatureSteps
end
step 'I submit new hook' do
- @url = Faker::Internet.uri("http")
+ @url = FFaker::Internet.uri("http")
fill_in "hook_url", with: @url
expect { click_button "Add Web Hook" }.to change(ProjectHook, :count).by(1)
end