saucy 0.4.3 → 0.4.4
Sign up to get free protection for your applications and to get access to all the features.
@@ -20,10 +20,12 @@
|
|
20
20
|
<% end %>
|
21
21
|
<% end %>
|
22
22
|
<% plan.limits.boolean.each do |limit| %>
|
23
|
-
|
24
|
-
|
23
|
+
<%= content_tag_for :li, limit, :class => limit.name do %>
|
24
|
+
<% if limit.allowed? -%>
|
25
25
|
<%= limit.name %>
|
26
|
-
<%
|
26
|
+
<% else %>
|
27
|
+
|
28
|
+
<% end -%>
|
27
29
|
<% end -%>
|
28
30
|
<% end %>
|
29
31
|
<% end -%>
|
@@ -6,7 +6,10 @@
|
|
6
6
|
<%= form.inputs :class => "radio optional" do %>
|
7
7
|
<% @plans.each do |plan| -%>
|
8
8
|
<%= content_tag_for :li, plan, :class => "#{plan.name.parameterize} #{'disabled' if !@account.can_change_plan_to?(plan)}" do %>
|
9
|
-
|
9
|
+
<div>
|
10
|
+
<%= render(plan) %>
|
11
|
+
</div>
|
12
|
+
<%= form.label :plan_id, "Choose plan", :value => plan.id %>
|
10
13
|
<%= form.radio_button :plan_id, plan.id, :disabled => !@account.can_change_plan_to?(plan), "data-free" => plan.free? %>
|
11
14
|
<% if !@account.can_change_plan_to?(plan) -%>
|
12
15
|
<p class="disabled"><%= t(".plan-disabled", :default => "Too big for %{name}.", :name => plan.name) %></p>
|
@@ -1,10 +1,10 @@
|
|
1
1
|
When /^I choose the "([^"]*)" plan$/ do |plan_name|
|
2
|
-
input_id = find(:xpath, "//
|
2
|
+
input_id = find(:xpath, "//li[contains(@class, 'plan')]//p[contains(text(), '#{plan_name}')]/../../input")["id"]
|
3
3
|
choose(input_id)
|
4
4
|
end
|
5
5
|
|
6
6
|
Then /^the "([^"]*)" plan should be disabled$/ do |plan_name|
|
7
|
-
input_id = find(:xpath, "//
|
7
|
+
input_id = find(:xpath, "//li[contains(@class, 'plan')]//p[contains(text(), '#{plan_name}')]/../../input")["id"]
|
8
8
|
page.should have_css("##{input_id}[disabled='disabled']")
|
9
9
|
end
|
10
10
|
|
@@ -1,16 +1,21 @@
|
|
1
1
|
Given /^"([^"]*)" is a member of the "([^"]*)" project$/ do |email, project_name|
|
2
2
|
user = User.find_by_email!(email)
|
3
3
|
project = Project.find_by_name!(project_name)
|
4
|
-
membership =
|
4
|
+
membership = Membership.find_by_user_id_and_account_id(user, project.account) ||
|
5
|
+
Factory(:membership, :user => user, :account => project.account)
|
5
6
|
Factory(:permission, :membership => membership, :project => project)
|
6
7
|
end
|
7
8
|
|
8
9
|
Given /^"([^"]*)" is an admin of the "([^"]*)" project$/ do |email, project_name|
|
9
10
|
user = User.find_by_email!(email)
|
10
11
|
project = Project.find_by_name!(project_name)
|
11
|
-
membership =
|
12
|
-
|
13
|
-
|
12
|
+
if membership = Membership.find_by_user_id_and_account_id(user, project.account)
|
13
|
+
membership.update_attribute(:admin, true)
|
14
|
+
else
|
15
|
+
membership = Factory(:membership, :user => user,
|
16
|
+
:account => project.account,
|
17
|
+
:admin => true)
|
18
|
+
end
|
14
19
|
Factory(:permission, :membership => membership, :project => project)
|
15
20
|
end
|
16
21
|
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: saucy
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
5
|
-
prerelease:
|
4
|
+
hash: 7
|
5
|
+
prerelease:
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 4
|
9
|
-
-
|
10
|
-
version: 0.4.
|
9
|
+
- 4
|
10
|
+
version: 0.4.4
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- thoughtbot, inc.
|
@@ -18,13 +18,12 @@ autorequire:
|
|
18
18
|
bindir: bin
|
19
19
|
cert_chain: []
|
20
20
|
|
21
|
-
date: 2011-04-
|
21
|
+
date: 2011-04-06 00:00:00 -04:00
|
22
22
|
default_executable:
|
23
23
|
dependencies:
|
24
24
|
- !ruby/object:Gem::Dependency
|
25
|
-
|
26
|
-
|
27
|
-
requirement: &id001 !ruby/object:Gem::Requirement
|
25
|
+
type: :runtime
|
26
|
+
version_requirements: &id001 !ruby/object:Gem::Requirement
|
28
27
|
none: false
|
29
28
|
requirements:
|
30
29
|
- - ">="
|
@@ -34,12 +33,12 @@ dependencies:
|
|
34
33
|
- 1
|
35
34
|
- 2
|
36
35
|
version: "1.2"
|
37
|
-
|
38
|
-
version_requirements: *id001
|
39
|
-
- !ruby/object:Gem::Dependency
|
40
|
-
name: railties
|
36
|
+
requirement: *id001
|
41
37
|
prerelease: false
|
42
|
-
|
38
|
+
name: formtastic
|
39
|
+
- !ruby/object:Gem::Dependency
|
40
|
+
type: :runtime
|
41
|
+
version_requirements: &id002 !ruby/object:Gem::Requirement
|
43
42
|
none: false
|
44
43
|
requirements:
|
45
44
|
- - ">="
|
@@ -50,12 +49,12 @@ dependencies:
|
|
50
49
|
- 0
|
51
50
|
- 3
|
52
51
|
version: 3.0.3
|
53
|
-
|
54
|
-
version_requirements: *id002
|
55
|
-
- !ruby/object:Gem::Dependency
|
56
|
-
name: braintree
|
52
|
+
requirement: *id002
|
57
53
|
prerelease: false
|
58
|
-
|
54
|
+
name: railties
|
55
|
+
- !ruby/object:Gem::Dependency
|
56
|
+
type: :runtime
|
57
|
+
version_requirements: &id003 !ruby/object:Gem::Requirement
|
59
58
|
none: false
|
60
59
|
requirements:
|
61
60
|
- - ">="
|
@@ -66,12 +65,12 @@ dependencies:
|
|
66
65
|
- 6
|
67
66
|
- 2
|
68
67
|
version: 2.6.2
|
69
|
-
|
70
|
-
version_requirements: *id003
|
71
|
-
- !ruby/object:Gem::Dependency
|
72
|
-
name: sham_rack
|
68
|
+
requirement: *id003
|
73
69
|
prerelease: false
|
74
|
-
|
70
|
+
name: braintree
|
71
|
+
- !ruby/object:Gem::Dependency
|
72
|
+
type: :runtime
|
73
|
+
version_requirements: &id004 !ruby/object:Gem::Requirement
|
75
74
|
none: false
|
76
75
|
requirements:
|
77
76
|
- - "="
|
@@ -82,12 +81,12 @@ dependencies:
|
|
82
81
|
- 3
|
83
82
|
- 3
|
84
83
|
version: 1.3.3
|
85
|
-
|
86
|
-
version_requirements: *id004
|
87
|
-
- !ruby/object:Gem::Dependency
|
88
|
-
name: sinatra
|
84
|
+
requirement: *id004
|
89
85
|
prerelease: false
|
90
|
-
|
86
|
+
name: sham_rack
|
87
|
+
- !ruby/object:Gem::Dependency
|
88
|
+
type: :runtime
|
89
|
+
version_requirements: &id005 !ruby/object:Gem::Requirement
|
91
90
|
none: false
|
92
91
|
requirements:
|
93
92
|
- - ">="
|
@@ -98,12 +97,12 @@ dependencies:
|
|
98
97
|
- 1
|
99
98
|
- 2
|
100
99
|
version: 1.1.2
|
101
|
-
|
102
|
-
version_requirements: *id005
|
103
|
-
- !ruby/object:Gem::Dependency
|
104
|
-
name: aruba
|
100
|
+
requirement: *id005
|
105
101
|
prerelease: false
|
106
|
-
|
102
|
+
name: sinatra
|
103
|
+
- !ruby/object:Gem::Dependency
|
104
|
+
type: :development
|
105
|
+
version_requirements: &id006 !ruby/object:Gem::Requirement
|
107
106
|
none: false
|
108
107
|
requirements:
|
109
108
|
- - "="
|
@@ -114,8 +113,9 @@ dependencies:
|
|
114
113
|
- 2
|
115
114
|
- 6
|
116
115
|
version: 0.2.6
|
117
|
-
|
118
|
-
|
116
|
+
requirement: *id006
|
117
|
+
prerelease: false
|
118
|
+
name: aruba
|
119
119
|
description: Clearance-based Rails engine for Software as a Service (Saas) that provides account and project management
|
120
120
|
email: support@thoughtbot.com
|
121
121
|
executables: []
|
@@ -296,7 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
296
296
|
requirements: []
|
297
297
|
|
298
298
|
rubyforge_project:
|
299
|
-
rubygems_version: 1.
|
299
|
+
rubygems_version: 1.4.1
|
300
300
|
signing_key:
|
301
301
|
specification_version: 3
|
302
302
|
summary: Clearance-based Rails engine for SaaS
|