Download as
Browse Code »

Commit 475d9f487f7050fcf8e52b319cd938c0949ed515

Authored by Nihad Abbasov
1 parent 078b312a
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

use ffaker gem

Showing 4 changed files with 7 additions and 8 deletions   Show diff stats
@@ -13,7 +13,7 @@ gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "810e3c11787 @@ -13,7 +13,7 @@ gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "810e3c11787
13 gem "gitolite", :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0" 13 gem "gitolite", :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0"
14 gem "carrierwave" 14 gem "carrierwave"
15 gem "six" 15 gem "six"
16 -gem "faker" 16 +gem "ffaker"
17 gem "seed-fu" 17 gem "seed-fu"
18 gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git" 18 gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git"
19 gem "pygments.rb", "0.2.12", :git => "https://github.com/gitlabhq/pygments.rb.git" 19 gem "pygments.rb", "0.2.12", :git => "https://github.com/gitlabhq/pygments.rb.git"
@@ -131,8 +131,7 @@ GEM @@ -131,8 +131,7 @@ GEM
131 eventmachine (0.12.10) 131 eventmachine (0.12.10)
132 execjs (1.3.2) 132 execjs (1.3.2)
133 multi_json (~> 1.0) 133 multi_json (~> 1.0)
134 - faker (1.0.1)  
135 - i18n (~> 0.4) 134 + ffaker (1.14.0)
136 ffi (1.0.11) 135 ffi (1.0.11)
137 foreman (0.46.0) 136 foreman (0.46.0)
138 thor (>= 0.13.6) 137 thor (>= 0.13.6)
@@ -337,7 +336,7 @@ DEPENDENCIES @@ -337,7 +336,7 @@ DEPENDENCIES
337 devise (~> 1.5) 336 devise (~> 1.5)
338 drapper 337 drapper
339 email_spec 338 email_spec
340 - faker 339 + ffaker
341 foreman 340 foreman
342 git 341 git
343 gitolite! 342 gitolite!
spec/factories.rb
  Diff comments   View file @475d9f4
@@ -61,7 +61,7 @@ Factory.add(:key, Key) do |obj| @@ -61,7 +61,7 @@ Factory.add(:key, Key) do |obj|
61 end 61 end
62 62
63 Factory.add(:web_hook, WebHook) do |obj| 63 Factory.add(:web_hook, WebHook) do |obj|
64 - obj.url = Faker::Internet.url 64 + obj.url = Faker::Internet.uri("http")
65 end 65 end
66 66
67 Factory.add(:wiki, Wiki) do |obj| 67 Factory.add(:wiki, Wiki) do |obj|
spec/requests/hooks_spec.rb
  Diff comments   View file @475d9f4
@@ -18,7 +18,7 @@ describe "Hooks" do @@ -18,7 +18,7 @@ describe "Hooks" do
18 18
19 describe "New Hook" do 19 describe "New Hook" do
20 before do 20 before do
21 - @url = Faker::Internet.url 21 + @url = Faker::Internet.uri("http")
22 visit project_hooks_path(@project) 22 visit project_hooks_path(@project)
23 fill_in "hook_url", :with => @url 23 fill_in "hook_url", :with => @url
24 expect { click_button "Add Web Hook" }.to change(WebHook, :count).by(1) 24 expect { click_button "Add Web Hook" }.to change(WebHook, :count).by(1)
@@ -30,8 +30,8 @@ describe "Hooks" do @@ -30,8 +30,8 @@ describe "Hooks" do
30 end 30 end
31 end 31 end
32 32
33 - describe "Test" do  
34 - before do 33 + describe "Test" do
  34 + before do
35 @hook = Factory :web_hook, :project => @project 35 @hook = Factory :web_hook, :project => @project
36 visit project_hooks_path(@project) 36 visit project_hooks_path(@project)
37 click_link "Test Hook" 37 click_link "Test Hook"