sufia 0.0.1.pre2 → 0.0.1

data/app/views/dashboard/index.html.erb

@@ -174,7 +174,6 @@ z-index:1;
 
 <% end %>
 
-
   <% @page_title = application_name + " Dashboard" %>
 
   <div class="row">

data/app/views/generic_files/_breadcrumbs.html.erb

@@ -21,7 +21,7 @@ limitations under the License.
 
      case request.referer
      when /dashboard/
-       crumbs << link_to('Dashboard', dashboard_path)
+       crumbs << link_to('Dashboard', sufia.dashboard_index_path)
      when /files/
        crumbs << link_to('Back to previous', request.referer)
      when /catalog/

data/app/views/generic_files/_descriptions.html.erb

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 %>
 
-<%= form_for @generic_file, :url => generic_file_path, :html => {:multipart => true, :class => 'form-horizontal', :id => 'fileupload'} do |f| %>
+<%= form_for @generic_file, :url => sufia.generic_file_path, :html => {:multipart => true, :class => 'form-horizontal', :id => 'fileupload'} do |f| %>
 <%= hidden_field_tag('generic_file[terms_of_service]', '1') %>
 <%= hidden_field_tag('redirect_tab', 'descriptions') %>
 <div id="descriptions_display">
@@ -25,8 +25,8 @@ limitations under the License.
         <%= f.label :resource_type, "Resource Types", :class=>"control-label", :for=>"resource_type" %>
         <div class="controls">
           <p class="help-block">You may select multiple types to apply<p>
-          <%= f.select "resource_type", options_for_select(ScholarSphere::Application::config.resource_types.keys, @generic_file.resource_type.to_a), {}, {:multiple=>true, :size=>7} %>
-          <a href="#" id="generic_file_resource_type_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help['generic_file_resource_type'] %>" data-original-title="Resource Type"><i class="icon-question-sign icon-large"></i></a>
+          <%= f.select "resource_type", options_for_select(Sufia::Engine.config.resource_types.keys, @generic_file.resource_type.to_a), {}, {:multiple=>true, :size=>7} %>
+          <a href="#" id="generic_file_resource_type_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help['generic_file_resource_type'] %>" data-original-title="Resource Type"><i class="icon-question-sign icon-large"></i></a>
         </div>
       </div><!-- /control-group -->
     

data/app/views/generic_files/_field_form

@@ -18,13 +18,13 @@
         <% if key == "description" %>
           <%= f.text_area :description, :name=>"generic_file[#{key}][]", :id => "generic_file_"+key, :value=>v, :class => "input-large" %>
         <% elsif key == "rights" %>
-          <% choices = ScholarSphere::Application::config.cc_licenses %>
+          <% choices = Sufia::Engine.config.cc_licenses %>
           <% choices = {""=>""}.merge(choices) %>
           <%= f.select "rights", options_for_select(choices, v) %>
         <% elsif key == "resource_type" %>
            <% if (index == 0) %>
             <p class="help-block">You may select multiple types to apply<p>
-            <% choices = ScholarSphere::Application::config.resource_types.keys %>
+            <% choices = Sufia::Engine.config.resource_types.keys %>
             <%= f.select "resource_type", options_for_select(choices, vals.to_a), {}, {:multiple=>true, :size=>7} %>
            <%end%>        
         <% else %>
@@ -35,7 +35,7 @@
             <button class="adder btn" name="additional_<%= key %>" id="additional_<%= key %>_submit">+<span class="accessible-hidden">add another <%= key %></span></button>
             &nbsp;
           <% end %>
-          <a href="#" id="generic_file_<%= key %>_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help['generic_file_' + key] %>" data-original-title="<%= label %>"><i class="icon-question-sign icon-large"></i></a>
+          <a href="#" id="generic_file_<%= key %>_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help['generic_file_' + key] %>" data-original-title="<%= label %>"><i class="icon-question-sign icon-large"></i></a>
           <%= render :partial => "generic_files/rights_modal" if key == "rights" %>
         <% elsif (key != "resource_type") %>
           <button class="remover btn" name="additional_<%= key %>" id="additional_<%= key %>_submit">-<span class="accessible-hidden">add another <%= key %></span></button>

data/app/views/generic_files/_media_display.html.erb

@@ -14,18 +14,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 %>
 
-<% if ['image/jpeg', 'image/png', 'image/bmp', 'image/gif', 'image/jpg'].include?(@generic_file.mime_type) %>
+<% if @generic_file.image? %>
   <a href="<%= sufia.download_path(@generic_file.noid) %>" target="_new"><img src="<%= sufia.download_path(@generic_file.noid) %>" width="338" /></a>
-<% elsif ['video/mp4'].include?(@generic_file.mime_type) %>
+<% elsif @generic_file.video? %>
   <video controls="controls" class="video-js vjs-default-skin" data-setup="{}" preload="auto">
-    <source src="<%= sufia.download_path(@generic_file.noid) %>" type="<%= @generic_file.mime_type %>" />
+    <source src="<%= sufia.download_path(@generic_file.noid, datastream_id: 'webm') %>" type="video/webm" />
+    <source src="<%= sufia.download_path(@generic_file.noid, datastream_id: 'mp4') %>" type="video/mp4" />
     Your browser does not support the audio tag.
   </video>
 <% elsif ['audio/mp3', 'audio/mpeg'].include?(@generic_file.mime_type) %>
   <audio src="<%= sufia.download_path(@generic_file.noid, format:'audio') %>" type="<%= @generic_file.mime_type %>" />
     Your browser does not support the audio tag.
     </audio>
-<% elsif ['application/pdf'].include?(@generic_file.mime_type) %>
+<% elsif @generic_file.pdf?%>
   <a href="<%= sufia.download_path(@generic_file.noid) %>" target="_new"><img src="<%= sufia.download_path(@generic_file.noid, {:datastream_id => 'thumbnail'}) %>" width="338" height="493" /></a>
 <% else %>
   <a href="<%= sufia.download_path(@generic_file.noid) %>" target="_new"><img src="/assets/default.png" alt="No preview available" width="338" height="493" /></a>

data/app/views/generic_files/_permission.html.erb

@@ -39,7 +39,7 @@ limitations under the License.
   </div>
   <div class="modal-body">
     <h3>Visibility</h3>
-    <p>This setting will determine who can view your file, and the associated metadata in ScholarSphere. Setting 
+    <p>This setting will determine who can view your file, and the associated metadata. Setting 
     the visibility to <span class="label label-success">Open Access</span> will allow your content to be discovered in Google and viewed by anyone.
     The visibility setting <span class="label label-info"><%=t('sufia.institution_name') %></span> will only allow users who are logged into <%=t('sufia.product_name') %>
     (via WebAccess) to view the content.  Files that are marked <span class="label label-important">Private</span> are only able to be viewed
@@ -98,7 +98,7 @@ limitations under the License.
       <div class="input-append">
         <p class="help-block">Enter <%=t('sufia.account_label') %> (one at a time)</p>
         <%= text_field_tag 'new_user_name_skel', nil, :class => "span29" %><span class="add-on">@psu.edu</span>
-        <%= select_tag 'new_user_permission_skel', options_for_select(ScholarSphere::Application::config.permission_levels), :class=> 'span17' %>
+        <%= select_tag 'new_user_permission_skel', options_for_select(Sufia::Engine.config.permission_levels), :class=> 'span17' %>
         <button class="btn btn-mini btn-inverse" id="add_new_user_skel"><i class="icon-plus-sign"></i> Add</button>
         <br /> <span id="directory_user_result"></span> 
       </div>
@@ -109,7 +109,7 @@ limitations under the License.
       <div class="input-append">
         <% @groups.unshift('Select a group') %>
         <%= select_tag 'new_group_name_skel', options_for_select(@groups), :class => 'span38' %>
-        <%= select_tag 'new_group_permission_skel', options_for_select(ScholarSphere::Application::config.permission_levels), :class => 'span17' %>
+        <%= select_tag 'new_group_permission_skel', options_for_select(Sufia::Engine.config.permission_levels), :class => 'span17' %>
         <button class="btn btn-mini btn-inverse" id="add_new_group_skel" ><i class="icon-plus-sign"></i> Add</button>
         <br /><span id="directory_group_result"></span>
       </div>
@@ -124,7 +124,7 @@ limitations under the License.
   <tr id="file_permissions">
     <td><%= label_tag :owner_access, "Depositor (<span id=\"file_owner\">#{link_to_profile depositor}</span>)".html_safe, :class=>"control-label" %></td>
     <td>
-    <%= ScholarSphere::Application::config.owner_permission_levels.keys[0] %>
+    <%= Sufia::Engine.config.owner_permission_levels.keys[0] %>
     </td>
   </tr>
   <% gf.permissions.each do |permission| %>
@@ -135,7 +135,7 @@ limitations under the License.
     <tr>
       <td><%= label_tag "generic_file[permissions][#{permission[:type]}][#{permission[:name]}]", permission[:name], :class=>"control-label" %></td>
       <td>
-      <%= select_tag "generic_file[permissions][#{permission[:type]}][#{permission[:name]}]", options_for_select(ScholarSphere::Application::config.permission_levels, permission[:access]), :class=>'span20 select_perm' %>
+      <%= select_tag "generic_file[permissions][#{permission[:type]}][#{permission[:name]}]", options_for_select(Sufia::Engine.config.permission_levels, permission[:access]), :class=>'span20 select_perm' %>
       <button class="btn close remove_perm">X</button>
       </td>
     </tr>

data/app/views/generic_files/_versioning.html.erb

@@ -17,7 +17,7 @@ limitations under the License.
 <div id="versioning_display">
   <h2 class="non lower">Versions</h2>
   <div class="well">
-    <%= form_for @generic_file, :url => generic_file_path, :html => {:multipart => true, :class => 'form-horizontal', :id => 'fileupload'} do |f| %>
+    <%= form_for @generic_file, :url => sufia.generic_file_path, :html => {:multipart => true, :class => 'form-horizontal', :id => 'fileupload'} do |f| %>
       <%= hidden_field_tag('generic_file[terms_of_service]', '1') %>
       <%= hidden_field_tag('redirect_tab', 'versions') %>
     <h3>Upload New Version</h3>

data/app/views/generic_files/edit.html.erb

@@ -84,7 +84,7 @@ $("a[rel=popover]").popover();
   </div>
   <div class="span2">&nbsp;</div>
   <div class="span68">
-    <%= link_to "&lt;&lt;Browse view".html_safe, generic_file_path %></li>
+    <%= link_to "&lt;&lt;Browse view".html_safe, sufia.generic_file_path %></li>
     <ul class="nav nav-tabs">
       <li id="edit_descriptions_link"><a href="#"><i class="icon-tags"></i> Descriptions</a></li>
       <li id="edit_versioning_link"><a href="#"><i class="icon-sitemap"></i> Versions</a></li>
@@ -92,7 +92,7 @@ $("a[rel=popover]").popover();
     </ul>
     <%= render :partial => "descriptions", :locals => { :generic_file => @generic_file } %>
 
-    <%= form_for @generic_file, :url => generic_file_path, :html => {:multipart => true, :class => 'form-horizontal', :id => 'fileupload'} do |f| %>
+    <%= form_for @generic_file, :url => sufia.generic_file_path, :html => {:multipart => true, :class => 'form-horizontal', :id => 'fileupload'} do |f| %>
       <%= hidden_field_tag('redirect_tab', 'permissions') %>
       <%= render :partial => "permission", :locals => { :gf => @generic_file, :f=> f } %>
     <% end %>

data/app/views/generic_files/show.html.erb

@@ -170,7 +170,7 @@ var addthis_config = {"data_track_addressbar":true};
           <th>Rights</th>
           <td>
             <% @generic_file.rights.each do |r| %>
-              <%=link_to_field('rights',r, ScholarSphere::Application::config.cc_licenses_reverse[r])%> <%= iconify_auto_link(r,false) %><br />
+              <%=link_to_field('rights',r, Sufia::Engine.config.cc_licenses_reverse[r])%> <%= iconify_auto_link(r,false) %><br />
             <% end %>
           </td>
         </tr>
@@ -257,14 +257,14 @@ var addthis_config = {"data_track_addressbar":true};
               <% label = label.humanize %>
               <% if values.is_a? Array %>
                 <% length = values.length %>
-                <% length = ScholarSphere::Application::config.fits_message_length-1  if term == :status_message && values.length > ScholarSphere::Application::config.fits_message_length-1  %>
+                <% length = Sufia::Engine.config.fits_message_length-1  if term == :status_message && values.length > Sufia::Engine.config.fits_message_length-1  %>
                 <% values[0..length].each_with_index do |value, idx| %>
                   <% next if value.empty? %>
                   <%= "#{label}: #{value.truncate(250)}" %>
                   <%= "<br />".html_safe unless idx == length %> 
                 <% end %>
                 <% if length != values.length %>
-                   <%= render :partial => "generic_files/extra_fields_modal", :locals=>{:name=>term, :values=> values, :start=>ScholarSphere::Application::config.fits_message_length}%>
+                   <%= render :partial => "generic_files/extra_fields_modal", :locals=>{:name=>term, :values=> values, :start=>Sufia::Engine.config.fits_message_length}%>
                 <% end %>
               <% else %>
                 <%= "#{label}: #{values.truncate(250)}" %><br />

data/app/views/static/versions.html.erb

@@ -15,7 +15,7 @@ limitations under the License.
 %>
 
 <h1>Versions</h1> 
-<h3>Version <%= ScholarSphere::Application::config.scholarsphere_version %> (<%= ScholarSphere::Application::config.scholarsphere_release_date %>)</h3>
+<h3>Version <%= Sufia::Engine::config.scholarsphere_version %> (<%= Sufia::Engine::config.scholarsphere_release_date %>)</h3>
 <p>
   <ul>
     <li>Added batch edit and delete</li>

data/app/views/users/edit.html.erb

@@ -27,7 +27,7 @@ $("a[rel=popover]").popover();
 
 <h1>Edit Profile</h1>
 <div class="span45 well">
-  <%= form_for @user, :url => update_profile_path(@user.login), :html => {:multipart => true, :class => 'form-horizontal' } do |f| %>
+  <%= form_for @user, :url => sufia.update_profile_path(URI.escape(@user.to_s, '@.')), :html => {:multipart => true, :class => 'form-horizontal' } do |f| %>
     <div class="control-group">
       <%= f.label :avatar, '<i class="icon-camera-retro"></i> Change picture'.html_safe, :class => "control-label" %>
       <div class="controls">
@@ -93,8 +93,10 @@ $("a[rel=popover]").popover();
   <hr />
 
   <h3><i class="icon-group"></i> User Managed Groups Info (UMG) <%= link_to 'Manage UMG', 'http://umg.its.psu.edu/', :class => 'btn btn-mini btn-primary' %> </h3>
-  <% @groups.each do |g| %>
-    <i class="icon-caret-right"></i> <%= g %><br />
+  <% if @groups %>
+    <% @groups.each do |g| %>
+      <i class="icon-caret-right"></i> <%= g %><br />
+    <% end %>
   <% end %>
 </div>
 

data/app/views/users/index.html.erb

@@ -32,9 +32,9 @@ limitations under the License.
         <tbody> 
             <% @users.each do |user| %> 
                 <tr class="<%= cycle("","zebra") %>"> 
-                   <td><a href="<%= profile_path(user.login) %>" class="btn btn-small " ><%= image_tag user.avatar.url(:thumb), :width => 30 %></a></td> 
-                   <td ><a href="<%= profile_path(user.login) %>"  ><%= user.name %><a></td> 
-                   <td><a href="<%= profile_path(user.login) %>"  ><%= user.login %><a></td>
+                   <td><a href="<%= sufia.profile_path(URI.escape(user.login,'@.'i)) %>" class="btn btn-small " ><%= image_tag user.avatar.url(:thumb), :width => 30 %></a></td> 
+                   <td ><a href="<%= sufia.profile_path(URI.escape(user.login,'@.'i)) %>"  ><%= user.name %><a></td> 
+                   <td><a href="<%= sufia.profile_path(URI.escape(user.login,'@.'i)) %>"  ><%= user.login %><a></td>
                    <td><%= user.department %> </td> 
                    <td><%= GenericFile.find(:depositor_t => user.to_s).count %> </td> 
                 </tr> 

data/app/views/users/show.html.erb

@@ -17,18 +17,18 @@ limitations under the License.
   <h1 class="span110">
     <span class="span60">
     <%= image_tag @user.avatar.url(:thumb), :width => 100 %>
-    <%= @user.name %> (<%= @user.login %>)
+    <%= @user.name %> (<%= @user.user_key %>)
     </span>
 
     <span class="span20 offset20">
       <% if not signed_in? %>
         <!-- sign in to access social functions -->
       <% elsif current_user == @user %>
-        <a class="btn btn-primary" href="<%= edit_profile_path(@user.to_s) %>"><i class="icon-edit"></i> Edit Your Profile </a>
+        <a class="btn btn-primary" href="<%= sufia.edit_profile_path(URI.escape(@user.to_s, '@.')) %>"><i class="icon-edit"></i> Edit Your Profile </a>
       <% elsif current_user.following?(@user) %>
-        <a class="btn btn-primary" href="<%= unfollow_user_path(@user.to_s) %>"><i class="icon-eye-close"></i> Unfollow </a>
+        <a class="btn btn-primary" href="<%= sufia.unfollow_user_path(@user.to_s) %>"><i class="icon-eye-close"></i> Unfollow </a>
       <% else %>
-        <a class="btn btn-primary" href="<%= follow_user_path(@user.to_s) %>"><i class="icon-eye-open"></i> Follow</a>
+        <a class="btn btn-primary" href="<%= sufia.follow_user_path(@user.to_s) %>"><i class="icon-eye-open"></i> Follow</a>
       <% end %>
     </span>
   </h1>
@@ -48,7 +48,7 @@ limitations under the License.
     <ul class="thumbnails">
       <% @followers.each do |f| %>
         <li class="span8">
-          <%= link_to(image_tag(f.avatar.url(:thumb)), profile_path(f.login), { :title => f.name } ) %>
+          <%= link_to(image_tag(f.avatar.url(:thumb)), sufia.profile_path(f.login), { :title => f.name } ) %>
         <li>
       <% end %>
     </ul>
@@ -59,7 +59,7 @@ limitations under the License.
     <ul class="thumbnails">
       <% @following.each do |f| %>
         <li class="span8">
-          <%= link_to(image_tag(f.avatar.url(:thumb)), profile_path(f.login), { :title => f.name } ) %>
+          <%= link_to(image_tag(f.avatar.url(:thumb)), sufia.profile_path(f.login), { :title => f.name } ) %>
         <li>
       <% end %>
     </ul>

data/config/jetty.yml

@@ -0,0 +1,6 @@
+default:
+  startup_wait: 45
+  jetty_port: 8983
+  java_opts:
+    - "-Xmx256m" 
+    - "-XX:MaxPermSize=128m"

data/config/routes.rb

@@ -20,7 +20,6 @@ Sufia::Engine.routes.draw do
     member do
       get 'citation', :as => :citation
       post 'audit'
-      post 'permissions'
     end
   end
 
@@ -46,9 +45,14 @@ Sufia::Engine.routes.draw do
   match 'users/:uid/unfollow' => 'users#unfollow', :as => :unfollow_user
 
   # Dashboard routes (based partly on catalog routes)
-  match 'dashboard' => 'dashboard#index', :as => :dashboard
-  match 'dashboard/activity' => 'dashboard#activity', :as => :dashboard_activity
-  match 'dashboard/facet/:id' => 'dashboard#facet', :as => :dashboard_facet
+  resources 'dashboard', :only=>:index do
+    collection do
+      get 'page/:page', :action => :index
+      get 'activity', :action => :activity, :as => :dashboard_activity
+      get 'facet/:id', :action => :facet, :as => :dashboard_facet
+    end
+  end
+    
 
   # advanced routes for advanced search
   match 'search' => 'advanced#index', :as => :advanced

data/features/browse_dashboard_files.feature

@@ -1,9 +1,19 @@
 Feature: Browse Dashboard files 
 
+
   Scenario: Browse via Fixtures 
-    Given I load scholarsphere fixtures
     Given I am logged in as "archivist2@example.com"
     And I follow "dashboard"
     And I follow "more Keywords"
     And I follow "keyf"
     Then I should see "Test mp3"
+
+  Scenario: Edit Dashboard File 
+    Given I am logged in as "archivist2@example.com"
+    And I follow "dashboard"
+    When I follow the link within
+    """
+    a[href="/files/test5/edit"]
+    """
+    Then I should see "Edit Test mp3"
+

data/features/browse_files.feature

@@ -1,15 +1,16 @@
 Feature: Browse files 
 
   Scenario: Browse via Fixtures 
-    Given I load scholarsphere fixtures
+#    Given I load sufia fixtures
     When I go to the home page
     And I follow "more Keyword"
     And I follow "test"
-    Then I should see "Displaying all 4 items"
+    Then I should see "1 - 4 of 4"
     When I follow "Test Document PDF"
     Then I should see "Download"
     But I should not see "Edit"
-    Given I am logged in as "archivist1"
-    When I follow "test"
-    And I follow "Test Document PDF"
+    Given I am logged in as "archivist1@example.com"
+    And I follow "more Keyword"
+    And I follow "test"
+    When I follow "Test Document PDF"
     And I should see "Edit"

data/features/contact_form.feature

@@ -1,6 +1,8 @@
 Feature: Sending an email via the contact form 
 
   Scenario: Input info to contact form and send 
+    # this step allows delivery even if the mail server is down
+    Given I have a mail server
     Given I am on the home page
     When I follow "Contact" 
     Then I should see "Contact Form"
@@ -11,6 +13,8 @@ Feature: Sending an email via the contact form
     And I select "Depositing content" from "contact_form_category"
     And I press "Send"
     Then I should see "Thank you"
+    # this step allows the delivery to go back to normal
+    Then I reset the mail server
 
   Scenario: Input no selection for contact type 
     Given I am on the home page

data/features/display_dashboard.feature

@@ -31,12 +31,15 @@ Feature: As an authenticate and authorized
     Then I should not see "Dashboard"
     Then the "search-field-header" field should contain "ss search"
 
- @javascript
+  @culerity
   Scenario: I have files on my dashboard I should see icons 
-    Given I load scholarsphere fixtures
+    #Given I load sufia fixtures
     And I am logged in as "archivist1@example.com"
     And I follow "dashboard"
     Then I should see "Test Document Text"
-    Given I follow "Delete"
+    When I follow the link within
+    """
+    a[href="/files/test3"].itemtrash
+    """
     Then I should see "The file has been deleted"
 

data/features/ingest_upload_files.feature

@@ -11,11 +11,11 @@ Feature: Uploading files via web form
     And I should see "Cancel upload"
     And I should see a file chooser button
 
-   @javascript
+   @celerity
    Scenario: Upload a file without checking terms of service
     Given I am logged in as "contentauthor@psu.edu"
     When I am on the "ingest" page 
     And I attach the file "spec/fixtures/image.jp2" to "files[]"
-    And I attach the file "spec/fixtures/libra-oa_1.foxml.xml" to "files[]"
+    And I attach the file "spec/fixtures/jp2_fits.xml" to "files[]"
     And I press "Start upload"
     Then I should see "You must accept the terms of service!"

data/features/step_definitions/fixture_steps.rb

@@ -22,13 +22,14 @@ def activefedora_path
   Gem.loaded_specs['active-fedora'].full_gem_path
 end
 
-Given /^I load scholarsphere fixtures$/ do
+Given /^I load sufia fixtures$/ do
   @rake = Rake::Application.new
   Rake.application = @rake
-  Rake.application.rake_require("lib/tasks/fixtures", ["."], loaded_files_excluding_current_rake_file)
-  Rake.application.rake_require("lib/tasks/active_fedora", [activefedora_path], loaded_files_excluding_current_rake_file)
+    Rake.application.rake_require("tasks/sufia-fixtures", ["."], loaded_files_excluding_current_rake_file)
+    Rake.application.rake_require("lib/tasks/fixtures", ["."], loaded_files_excluding_current_rake_file)
+    Rake.application.rake_require("lib/tasks/active_fedora", [activefedora_path], loaded_files_excluding_current_rake_file)
   Rake::Task.define_task(:environment)
-  @rake['scholarsphere:fixtures:refresh'].invoke
-  @rake['scholarsphere:fixtures:fix'].invoke
+  @rake['sufia:fixtures:refresh'].invoke
+  @rake['sufia:fixtures:fix'].invoke
 end
 

data/features/step_definitions/scholarsphere.rb

@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 When /^I attach a file "([^"]*)" to the dynamically created "([^"]*)"$/ do |path, field|
   find(field).native.send_keys(File.expand_path(path, Rails.root))
 end
@@ -20,6 +19,23 @@ Given /^And I click the anchor "([^"]*)"$/ do |link|
   click_link(link)
 end
 
+Given /^And I click within the anchor "(.*?)"$/ do |selector|
+#Given /^(?:|I )click within the anchor "([^"]*)"$/ do |selector|
+  find(selector).click
+end
+
+Given /^I have a mail server$/ do
+  ContactForm.any_instance.stubs(:deliver).returns(true)
+end
+
+Then /^I reset the mail server$/ do
+  ContactForm.any_instance.unstub(:deliver)
+end
+
+When /^I follow the link within$/ do |selector|
+  find(selector).click
+end
+
 # tests wether a select option is choosen
 Then /^"([^"]*)" should be selected for "([^"]*)"(?: within "([^\"]*)")?$/ do |value, field, selector|
   with_scope(selector) do
@@ -42,3 +58,10 @@ Then /^"([^\"]*)" should( not)? be disabled$/ do |label, negate|
   end
   ["false", "", nil].send(negate ? :should : :should_not, include(field[:disabled]))
 end
+
+Given /^I load users$/ do
+  FactoryGirl.create(:user)
+  FactoryGirl.create(:archivist)
+  FactoryGirl.create(:curator)
+end
+