From 52dac513f73658cf2bd38da493fbcc6c6ab38473 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sat, 12 Sep 2015 10:03:56 +0200
Subject: [PATCH] AutoCommit Sam Sep 12 10:03:56 CEST 2015

---
 app/views/beispiele/_form.html.erb     |   6 +++---
 spec/factories/logo2014_64.png         | Bin 0 -> 2455 bytes
 spec/features/beispielsammlung_spec.rb |  19 +++++++++++++++----
 3 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 spec/factories/logo2014_64.png

diff --git a/app/views/beispiele/_form.html.erb b/app/views/beispiele/_form.html.erb
index 7f6df24..07285a6 100755
--- a/app/views/beispiele/_form.html.erb
+++ b/app/views/beispiele/_form.html.erb
@@ -12,7 +12,7 @@
       <% end %>
       </div>
   <div class="span6">
-    <% f.file_field :beispieldatei, :label => "Neue Datei hochladen:"%>
+    <%= f.file_field :beispieldatei, :label => "Neue Datei hochladen:" if @beispiel.beispieldatei.nil? || @beispiel.beispieldatei.blank? %>
   </div>
   <%=f.input :datum , :as => :datetimepicker %>
     
@@ -20,11 +20,11 @@
     
 <div class="row-fluid">
   <%= f.input :name %>
-  
+  <%= f.input :lva  if @beispiel.lva.nil?%>
   <%= f.input :desc %>
 </div>
   <div class="span4">
-    <%= f.input :lecturer, :as=>:select, :collection => @beispiel.lva.lecturers %>
+    <%= f.input :lecturer, :as=>:select, :collection => ((@beispiel.lva.nil?|| @beispiel.lva.lecturers.empty?)? Lecturer.all : @beispiel.lva.lecturers) %>
   </div>
 <%= f.hidden_field :beispieldatei_cache %>
 <%= f.actions do %>
diff --git a/spec/factories/logo2014_64.png b/spec/factories/logo2014_64.png
new file mode 100644
index 0000000000000000000000000000000000000000..10b2ecf27a0780c3942abcfd9d7cf76bef44e350
GIT binary patch
literal 2455
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
Vz1=uh?-c+5002ovPDHLkV1lo{WAy+4

literal 0
HcmV?d00001

diff --git a/spec/features/beispielsammlung_spec.rb b/spec/features/beispielsammlung_spec.rb
index 4278fa6..96864e6 100644
--- a/spec/features/beispielsammlung_spec.rb
+++ b/spec/features/beispielsammlung_spec.rb
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'spec_helper'
 Capybara.add_selector(:href) do
     xpath {|href| XPath.descendant[XPath.attr(:href).contains(href)] }
@@ -6,7 +7,7 @@ feature 'Beispielsammlung', :type=>:feature do
   let!(:rubrik) {FactoryGirl.create(:rubrik)}
   let!(:user) {FactoryGirl.create(:user)}
   let!(:themengruppe){    FactoryGirl.create(:themengruppe) }
-  let!(:studium) {FactoryGirl.create(:studium)}
+  let!(:studium) {FactoryGirl.create(:studium,:visible=>true)}
   before(:each) do 
     FactoryGirl.create(:neuigkeit, rubrik_id: rubrik.id, author_id: user.id)
     FactoryGirl.create(:thema, id: t=YAML.load_file("#{::Rails.root.to_s}/config/start_topic.yml").to_i, themengruppe_id: themengruppe.id) 
@@ -23,20 +24,30 @@ feature 'Beispielsammlung', :type=>:feature do
   end
   def sign_in  
    visit '/'
+    user.add_role(:fetadmin)
+
     find(:href, "sign_in").click
     fill_in 'user_email', with: user.email
     fill_in 'user_password', with:"password"
     click_button 'Sign in'
   end 
   scenario 'anonym user visits beispielsammlung' do
-   # sign_in
-    visit "/studien/#{studium.id}"
-  #  click_link 'Beispielsammlung'
+#    sign_in
+    visit "/"
+    click_link 'Beispielsammlung'
     expect(page).to have_text(studium.title)
 #    expect(page).to have_tag("link to lva")
 #    click_link 'LVA1'
     #    expect(page).to have_text(beispiel.name)
   end
+  scenario 'load something up' do 
+    visit "/"
+    click_link 'Beispiel hinzufügen'
+    page.attach_file('beispiel[beispieldatei]', Rails.root + 'spec/factories/logo2014_64.png')
+    click_button "Create Beispiel"
 
+   # find(:href,"/beispiele/new").click
+
+    end
 end