diff options
| author | Alban Peignier | 2012-04-19 10:10:23 +0200 | 
|---|---|---|
| committer | Alban Peignier | 2012-04-19 10:10:23 +0200 | 
| commit | 31c3a945318d135850409e412c710ffbe2f599a7 (patch) | |
| tree | 37491c9ae91ba3ac749f12660840a8952900bdc5 /spec/views | |
| parent | fa8fd7f710737e8f833cda2e3c74e24d40e6dfcd (diff) | |
| download | chouette-core-31c3a945318d135850409e412c710ffbe2f599a7.tar.bz2 | |
Uses new FactoryGirl syntax in specs. Refs #13
Diffstat (limited to 'spec/views')
| -rw-r--r-- | spec/views/companies/edit.html.erb_spec.rb | 6 | ||||
| -rw-r--r-- | spec/views/companies/index.html.erb_spec.rb | 4 | ||||
| -rw-r--r-- | spec/views/companies/new.html.erb_spec.rb | 4 | ||||
| -rw-r--r-- | spec/views/companies/show.html.erb_spec.rb | 4 | ||||
| -rw-r--r-- | spec/views/lines/edit.html.erb_spec.rb | 10 | ||||
| -rw-r--r-- | spec/views/lines/index.html.erb_spec.rb | 8 | ||||
| -rw-r--r-- | spec/views/lines/new.html.erb_spec.rb | 8 | ||||
| -rw-r--r-- | spec/views/lines/show.html.erb_spec.rb | 4 | ||||
| -rw-r--r-- | spec/views/networks/edit.html.erb_spec.rb | 4 | ||||
| -rw-r--r-- | spec/views/networks/index.html.erb_spec.rb | 4 | ||||
| -rw-r--r-- | spec/views/networks/new.html.erb_spec.rb | 4 | ||||
| -rw-r--r-- | spec/views/networks/show.html.erb_spec.rb | 4 | ||||
| -rw-r--r-- | spec/views/referentials/show.html.erb_spec.rb | 2 | 
13 files changed, 33 insertions, 33 deletions
diff --git a/spec/views/companies/edit.html.erb_spec.rb b/spec/views/companies/edit.html.erb_spec.rb index ef3418279..22a561daf 100644 --- a/spec/views/companies/edit.html.erb_spec.rb +++ b/spec/views/companies/edit.html.erb_spec.rb @@ -1,9 +1,9 @@  require 'spec_helper'  describe "/companies/edit" do -  let!(:referential) { assign(:referential, Factory(:referential)) } -  let!(:company) { assign(:company, Factory(:company)) } -  let!(:companies) { Array.new(2) { Factory(:company) } } +  let!(:referential) { assign(:referential, create(:referential)) } +  let!(:company) { assign(:company, create(:company)) } +  let!(:companies) { Array.new(2) { create(:company) } }    describe "test" do      it "should render h2 with the company name" do diff --git a/spec/views/companies/index.html.erb_spec.rb b/spec/views/companies/index.html.erb_spec.rb index 3c2df6c45..23aa91def 100644 --- a/spec/views/companies/index.html.erb_spec.rb +++ b/spec/views/companies/index.html.erb_spec.rb @@ -2,8 +2,8 @@ require 'spec_helper'  describe "/companies/index" do -  let!(:referential) { assign( :referential, Factory(:referential) ) } -  let!(:companies) { assign :companies, Array.new(2) { Factory(:company) }.paginate  }   +  let!(:referential) { assign( :referential, create(:referential) ) } +  let!(:companies) { assign :companies, Array.new(2) { create(:company) }.paginate  }      let!(:search) { assign :q, Ransack::Search.new(Chouette::Company) }    it "should render a show link for each group" do         diff --git a/spec/views/companies/new.html.erb_spec.rb b/spec/views/companies/new.html.erb_spec.rb index 5030dcdba..a28e430f3 100644 --- a/spec/views/companies/new.html.erb_spec.rb +++ b/spec/views/companies/new.html.erb_spec.rb @@ -1,8 +1,8 @@  require 'spec_helper'  describe "/companies/new" do -  let!(:referential) { assign(:referential, Factory(:referential)) } -  let!(:company) { assign(:company, Factory.build(:company)) } +  let!(:referential) { assign(:referential, create(:referential)) } +  let!(:company) { assign(:company, build(:company)) }    describe "form" do diff --git a/spec/views/companies/show.html.erb_spec.rb b/spec/views/companies/show.html.erb_spec.rb index 2e35a3fb7..7bd20df8c 100644 --- a/spec/views/companies/show.html.erb_spec.rb +++ b/spec/views/companies/show.html.erb_spec.rb @@ -2,8 +2,8 @@ require 'spec_helper'  describe "/companies/show" do -  let!(:referential) { assign(:referential, Factory(:referential)) } -  let!(:company) { assign(:company, Factory(:company)) } +  let!(:referential) { assign(:referential, create(:referential)) } +  let!(:company) { assign(:company, create(:company)) }    it "should render h2 with the company name" do      render diff --git a/spec/views/lines/edit.html.erb_spec.rb b/spec/views/lines/edit.html.erb_spec.rb index 98216eb52..ca17fbeab 100644 --- a/spec/views/lines/edit.html.erb_spec.rb +++ b/spec/views/lines/edit.html.erb_spec.rb @@ -1,11 +1,11 @@  require 'spec_helper'  describe "/lines/edit" do -  let!(:referential) { assign(:referential, Factory(:referential)) } -  let!(:network) { Factory(:network) } -  let!(:company) { Factory(:company) } -  let!(:line) { assign(:line, Factory(:line, :network => network, :company => company)) } -  let!(:lines) { Array.new(2) { Factory(:line, :network => network, :company => company) } } +  let!(:referential) { assign(:referential, create(:referential)) } +  let!(:network) { create(:network) } +  let!(:company) { create(:company) } +  let!(:line) { assign(:line, create(:line, :network => network, :company => company)) } +  let!(:lines) { Array.new(2) { create(:line, :network => network, :company => company) } }    describe "test" do      it "should render h2 with the group name" do diff --git a/spec/views/lines/index.html.erb_spec.rb b/spec/views/lines/index.html.erb_spec.rb index ddd7d9c76..853da2103 100644 --- a/spec/views/lines/index.html.erb_spec.rb +++ b/spec/views/lines/index.html.erb_spec.rb @@ -2,10 +2,10 @@ require 'spec_helper'  describe "/lines/index" do -  let!(:referential) { assign :referential, Factory(:referential) } -  let!(:network) { Factory :network } -  let!(:company) { Factory :company } -  let!(:lines) { assign :lines, Array.new(2) { Factory(:line, :network => network, :company => company) }.paginate }   +  let!(:referential) { assign :referential, create(:referential) } +  let!(:network) { create :network } +  let!(:company) { create :company } +  let!(:lines) { assign :lines, Array.new(2) { create(:line, :network => network, :company => company) }.paginate }      let!(:q) { assign :q, Ransack::Search.new(Chouette::Line) }    before :each do diff --git a/spec/views/lines/new.html.erb_spec.rb b/spec/views/lines/new.html.erb_spec.rb index 48f36a036..7433162d1 100644 --- a/spec/views/lines/new.html.erb_spec.rb +++ b/spec/views/lines/new.html.erb_spec.rb @@ -1,10 +1,10 @@  require 'spec_helper'  describe "/lines/new" do -  let!(:referential) { assign(:referential, Factory(:referential)) } -  let!(:network) { Factory(:network) } -  let!(:company) { Factory(:company) } -  let!(:line) { assign(:line, Factory.build(:line, :network => network, :company => company )) } +  let!(:referential) { assign(:referential, create(:referential)) } +  let!(:network) { create(:network) } +  let!(:company) { create(:company) } +  let!(:line) { assign(:line, build(:line, :network => network, :company => company )) }    describe "form" do diff --git a/spec/views/lines/show.html.erb_spec.rb b/spec/views/lines/show.html.erb_spec.rb index 894956ed0..f11727a81 100644 --- a/spec/views/lines/show.html.erb_spec.rb +++ b/spec/views/lines/show.html.erb_spec.rb @@ -2,8 +2,8 @@ require 'spec_helper'  describe "/lines/show" do -  let!(:referential) { assign :referential, Factory(:referential) } -  let!(:line) { assign :line, Factory(:line) } +  let!(:referential) { assign :referential, create(:referential) } +  let!(:line) { assign :line, create(:line) }    let!(:map) { assign(:map, mock(:to_html => '<div id="map"/>')) }    it "should render h2 with the line name" do diff --git a/spec/views/networks/edit.html.erb_spec.rb b/spec/views/networks/edit.html.erb_spec.rb index 5274f479a..b8ea64288 100644 --- a/spec/views/networks/edit.html.erb_spec.rb +++ b/spec/views/networks/edit.html.erb_spec.rb @@ -1,8 +1,8 @@  require 'spec_helper'  describe "/networks/edit" do -  let!(:referential) { assign(:referential, Factory(:referential)) } -  let!(:network) { assign(:network, Factory(:network) ) } +  let!(:referential) { assign(:referential, create(:referential)) } +  let!(:network) { assign(:network, create(:network) ) }    describe "test" do      it "should render h2 with the group name" do diff --git a/spec/views/networks/index.html.erb_spec.rb b/spec/views/networks/index.html.erb_spec.rb index f843a944e..6e20c2c46 100644 --- a/spec/views/networks/index.html.erb_spec.rb +++ b/spec/views/networks/index.html.erb_spec.rb @@ -2,8 +2,8 @@ require 'spec_helper'  describe "/networks/index" do -  let!(:referential) { assign :referential, Factory(:referential) } -  let!(:networks) { assign :networks, Array.new(2){ Factory(:network) }.paginate }   +  let!(:referential) { assign :referential, create(:referential) } +  let!(:networks) { assign :networks, Array.new(2){ create(:network) }.paginate }      let!(:search) { assign :q, Ransack::Search.new(Chouette::Network) }    it "should render a show link for each group" do         diff --git a/spec/views/networks/new.html.erb_spec.rb b/spec/views/networks/new.html.erb_spec.rb index 6651f6b56..4a2551fcd 100644 --- a/spec/views/networks/new.html.erb_spec.rb +++ b/spec/views/networks/new.html.erb_spec.rb @@ -1,8 +1,8 @@  require 'spec_helper'  describe "/networks/new" do -  let!(:referential) { assign(:referential, Factory(:referential)) } -  let!(:network) {  assign(:network, Factory.build(:network)) } +  let!(:referential) { assign(:referential, create(:referential)) } +  let!(:network) {  assign(:network, build(:network)) }    describe "form" do diff --git a/spec/views/networks/show.html.erb_spec.rb b/spec/views/networks/show.html.erb_spec.rb index fae79eb29..9c05fe4aa 100644 --- a/spec/views/networks/show.html.erb_spec.rb +++ b/spec/views/networks/show.html.erb_spec.rb @@ -2,8 +2,8 @@ require 'spec_helper'  describe "/networks/show" do -  let!(:referential) { assign(:referential, Factory(:referential)) } -  let!(:network) { assign(:network, Factory(:network)) } +  let!(:referential) { assign(:referential, create(:referential)) } +  let!(:network) { assign(:network, create(:network)) }    let!(:map) { assign(:map, mock(:to_html => '<div id="map"/>')) }    it "should render h2 with the network name" do diff --git a/spec/views/referentials/show.html.erb_spec.rb b/spec/views/referentials/show.html.erb_spec.rb index 30347bae8..70518a270 100644 --- a/spec/views/referentials/show.html.erb_spec.rb +++ b/spec/views/referentials/show.html.erb_spec.rb @@ -1,7 +1,7 @@  require 'spec_helper'  describe "referentials/show.html.erb" do -  let!(:referential) { assign(:referential, Factory(:referential)) } +  let!(:referential) { assign(:referential, create(:referential)) }    it "should have a title with name" do      render  | 
