enju_leaf 1.1.0.rc12 → 1.1.0.rc13

data/spec/requests/{users_spec.rb → profiles_spec.rb}

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe "Users" do
-  describe "GET /users" do
+describe "Profiles" do
+  describe "GET /profiles" do
     it "works! (now write some real specs)" do
-      get users_path
+      get profiles_path
     end
   end
 end

data/spec/routing/accounts_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe UsersController do
+describe ProfilesController do
   describe "routing" do
 
     it "recognizes and generates #new" do

data/spec/routing/profiles_routing_spec.rb

@@ -0,0 +1,35 @@
+require "spec_helper"
+
+describe ProfilesController do
+  describe "routing" do
+
+    it "recognizes and generates #index" do
+      { :get => "/profiles" }.should route_to(:controller => "profiles", :action => "index")
+    end
+
+    it "recognizes and generates #new" do
+      { :get => "/profiles/new" }.should route_to(:controller => "profiles", :action => "new")
+    end
+
+    it "recognizes and generates #show" do
+      { :get => "/profiles/1" }.should route_to(:controller => "profiles", :action => "show", :id => "1")
+    end
+
+    it "recognizes and generates #edit" do
+      { :get => "/profiles/1/edit" }.should route_to(:controller => "profiles", :action => "edit", :id => "1")
+    end
+
+    it "recognizes and generates #create" do
+      { :post => "/profiles" }.should route_to(:controller => "profiles", :action => "create")
+    end
+
+    it "recognizes and generates #update" do
+      { :put => "/profiles/1" }.should route_to(:controller => "profiles", :action => "update", :id => "1")
+    end
+
+    it "recognizes and generates #destroy" do
+      { :delete => "/profiles/1" }.should route_to(:controller => "profiles", :action => "destroy", :id => "1")
+    end
+
+  end
+end

data/spec/support/resque.rb

@@ -4,6 +4,7 @@ RSpec.configure do |config|
   REDIS_CACHE_PATH = "#{Rails.root}/tmp/cache/"
 
   unless ENV["TRAVIS"]
+    Resque.redis = 'localhost:9736'
     config.before(:suite) do
       redis_options = {
         "daemonize"     => 'yes',

data/spec/views/{users → profiles}/edit.html.erb_spec.rb

@@ -1,12 +1,10 @@
 require 'spec_helper'
 
-describe "users/edit" do
-  fixtures :user_groups
+describe "profiles/edit" do
+  fixtures :all
 
   before(:each) do
-    @user = assign(:user, stub_model(User,
-      :username => "MyString"
-    ))
+    @profile = assign(:profile, profiles(:admin))
     assign(:user_groups, UserGroup.all)
     assign(:libraries, Library.all)
     assign(:roles, Role.all)
@@ -18,8 +16,8 @@ describe "users/edit" do
     render
 
     # Run the generator again with the --webrat flag if you want to use webrat matchers
-    assert_select "form", :action => users_path(@user), :method => "post" do
-      assert_select "input#user_email", :name => "user[email]"
+    assert_select "form", :action => profiles_path(@profile), :method => "post" do
+      assert_select "input#profile_user_number", :name => "profile[user_number]"
     end
   end
 end

data/spec/views/{users → profiles}/index.html.erb_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
-describe "users/index" do
+describe "profiles/index" do
   fixtures :all
 
   before(:each) do
-    assign(:users, User.page(1))
+    assign(:profiles, Profile.page(1))
     view.stub(:current_user).and_return(User.find('admin'))
   end
 
-  it "renders a list of users" do
+  it "renders a list of profiles" do
     render
     # Run the generator again with the --webrat flag if you want to use webrat matchers
     assert_select "tr>td", :text => 'admin'

data/spec/views/{users → profiles}/new.html.erb_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe "users/new" do
+describe "profiles/new" do
   fixtures :user_groups
 
   before(:each) do
-    assign(:user, stub_model(User,
-      :username => "MyString"
+    assign(:profile, stub_model(Profile,
+      :user_group_id => 1
     ).as_new_record)
     assign(:user_groups, UserGroup.all)
     assign(:libraries, Library.all)
@@ -18,8 +18,8 @@ describe "users/new" do
     render
 
     # Run the generator again with the --webrat flag if you want to use webrat matchers
-    assert_select "form", :action => users_path, :method => "post" do
-      assert_select "input#user_username", :name => "user[username]"
+    assert_select "form", :action => profiles_path, :method => "post" do
+      assert_select "input#profile_user_number", :name => "profile[user_number]"
     end
   end
 end

data/spec/views/profiles/show.html.erb_spec.rb

@@ -0,0 +1,20 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe "profiles/show" do
+  fixtures :all
+
+  before(:each) do
+    @profile = assign(:profile, profiles(:admin))
+    view.stub(:current_user).and_return(User.find('admin'))
+    @ability = Object.new
+    @ability.extend(CanCan::Ability)
+    controller.stub(:current_ability) { @ability }
+  end
+
+  it "renders attributes in <p>" do
+    render
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    rendered.should match(/Checkout/)
+  end
+end

data/vendor/assets/javascripts/jquery.colorbox.js

@@ -1,5 +1,5 @@
 /*!
-	Colorbox v1.5.10 - 2014-06-26
+	Colorbox v1.5.13 - 2014-08-04
 	jQuery lightbox and modal window plugin
 	(c) 2014 Jack Moore - http://www.jacklmoore.com/colorbox
 	license: http://www.opensource.org/licenses/mit-license.php
@@ -415,8 +415,9 @@
 				}
 			}
 
+			var opacity = parseFloat(settings.get('opacity'));
 			$overlay.css({
-				opacity: parseFloat(settings.get('opacity')) || '',
+				opacity: opacity === opacity ? opacity : '',
 				cursor: settings.get('overlayClose') ? 'pointer' : '',
 				visibility: 'visible'
 			}).show();
@@ -696,7 +697,7 @@
 					}, 1);
 				}
 
-				if (loadedCallback) {
+				if ($.isFunction(loadedCallback)) {
 					loadedCallback();
 				}
 			},

data/vendor/assets/stylesheets/colorbox.css

@@ -20,7 +20,7 @@
     Change the following styles to modify the appearance of Colorbox.  They are
     ordered & tabbed in a way that represents the nesting of the generated HTML.
 */
-#cboxOverlay{background:url(images/overlay.png) repeat 0 0;}
+#cboxOverlay{background:url(images/overlay.png) repeat 0 0; opacity: 0.9; filter: alpha(opacity = 90);}
 #colorbox{outline:0;}
     #cboxTopLeft{width:21px; height:21px; background:url(images/controls.png) no-repeat -101px 0;}
     #cboxTopRight{width:21px; height:21px; background:url(images/controls.png) no-repeat -130px 0;}