Commit 475d9f48 authored by Nihad Abbasov's avatar Nihad Abbasov

use ffaker gem

parent 078b312a
......@@ -13,7 +13,7 @@ gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "810e3c11787
gem "gitolite", :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0"
gem "carrierwave"
gem "six"
gem "faker"
gem "ffaker"
gem "seed-fu"
gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git"
gem "pygments.rb", "0.2.12", :git => "https://github.com/gitlabhq/pygments.rb.git"
......
......@@ -131,8 +131,7 @@ GEM
eventmachine (0.12.10)
execjs (1.3.2)
multi_json (~> 1.0)
faker (1.0.1)
i18n (~> 0.4)
ffaker (1.14.0)
ffi (1.0.11)
foreman (0.46.0)
thor (>= 0.13.6)
......@@ -337,7 +336,7 @@ DEPENDENCIES
devise (~> 1.5)
drapper
email_spec
faker
ffaker
foreman
git
gitolite!
......
......@@ -61,7 +61,7 @@ Factory.add(:key, Key) do |obj|
end
Factory.add(:web_hook, WebHook) do |obj|
obj.url = Faker::Internet.url
obj.url = Faker::Internet.uri("http")
end
Factory.add(:wiki, Wiki) do |obj|
......
......@@ -18,7 +18,7 @@ describe "Hooks" do
describe "New Hook" do
before do
@url = Faker::Internet.url
@url = Faker::Internet.uri("http")
visit project_hooks_path(@project)
fill_in "hook_url", :with => @url
expect { click_button "Add Web Hook" }.to change(WebHook, :count).by(1)
......@@ -30,8 +30,8 @@ describe "Hooks" do
end
end
describe "Test" do
before do
describe "Test" do
before do
@hook = Factory :web_hook, :project => @project
visit project_hooks_path(@project)
click_link "Test Hook"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment