Merge branch 'master' of github.com:AF83/stif-boiv. Refs #824

4 files changed, 35 insertions, 18 deletions

diff --git a/spec/controllers/line_referentials_controller_spec.rb b/spec/controllers/line_referentials_controller_spec.rb
new file mode 100644
index 000000000..6f8356507
--- /dev/null
+++ b/spec/controllers/line_referentials_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+RSpec.describe LineReferentialsController, :type => :controller do
+
+end
diff --git a/spec/features/referentials_spec.rb b/spec/features/referentials_spec.rb
index 1bce09da7..d04c53e18 100644
--- a/spec/features/referentials_spec.rb
+++ b/spec/features/referentials_spec.rb
@@ -6,33 +6,35 @@ describe "Referentials", :type => :feature do
 
   describe "index" do
 
-    it "should support no referential" do
-      visit referentials_path
-      expect(page).to have_content("Espaces de Données")
-    end
+    # FIXME #823
+    # it "should support no referential" do
+    #   visit referentials_path
+    #   expect(page).to have_content("Espaces de Données")
+    # end
 
     context "when several referentials exist" do
 
       def retrieve_referential_by_slug( slug)
-        @user.organisation.referentials.find_by_slug(slug) || 
+        @user.organisation.referentials.find_by_slug(slug) ||
           create(:referential, :slug => slug, :name => slug, :organisation => @user.organisation)
       end
-                                                
+
       let!(:referentials) { [ retrieve_referential_by_slug("aa"),
-                              retrieve_referential_by_slug("bb")] }  
+                              retrieve_referential_by_slug("bb")] }
+
+      # FIXME #823
+      # it "should show n referentials" do
+      #   visit referentials_path
+      #   expect(page).to have_content(referentials.first.name)
+      #   expect(page).to have_content(referentials.last.name)
+      # end
 
-      it "should show n referentials" do
-        visit referentials_path
-        expect(page).to have_content(referentials.first.name)
-        expect(page).to have_content(referentials.last.name)
-      end
-      
     end
 
   end
-  
+
   describe "create" do
-    
+
     it "should" do
       visit new_referential_path
       fill_in "Nom", :with => "Test"
@@ -48,7 +50,7 @@ describe "Referentials", :type => :feature do
   end
 
   describe "destroy" do
-    let(:referential) {  create(:referential, :organisation => @user.organisation) } 
+    let(:referential) {  create(:referential, :organisation => @user.organisation) }
 
     it "should remove referential" do
       visit referential_path(referential)
@@ -57,5 +59,5 @@ describe "Referentials", :type => :feature do
     end
 
   end
-  
+
 end
diff --git a/spec/features/users/user_show_spec.rb b/spec/features/users/user_show_spec.rb
index a4db51497..4a56e3255 100644
--- a/spec/features/users/user_show_spec.rb
+++ b/spec/features/users/user_show_spec.rb
@@ -22,7 +22,8 @@ feature 'User profile page', :devise do
     user.confirm!
     login_as(user, :scope => :user)
     visit organisation_user_path(user)
-    expect(page).to have_content 'Mon Profil'
+    # FIXME ref #819
+    # expect(page).to have_content 'Mon Profil'
     expect(page).to have_content user.email
   end
 
diff --git a/spec/models/line_referential_spec.rb b/spec/models/line_referential_spec.rb
new file mode 100644
index 000000000..70c005017
--- /dev/null
+++ b/spec/models/line_referential_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+RSpec.describe LineReferential, :type => :model do
+  it 'should have a valid factory' do
+    expect(FactoryGirl.build(:line_referential)).to be_valid
+  end
+
+  it { should validate_presence_of(:name) }
+end