Skip to content

Commit 3304555

Browse files
author
Nils Henning
committed
fix complete 0.8 test suite
1 parent 67ecd69 commit 3304555

File tree

5 files changed

+45
-62
lines changed

5 files changed

+45
-62
lines changed

.byebug_history

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,38 @@
11
continue
2+
save_screenshot
3+
continue
4+
context
5+
continue
6+
titleize 'foo'
7+
params
8+
self.class
9+
continue
10+
self.class.superclass.superclass
11+
self.class.superclass
12+
self.class
13+
continue
14+
@view_context.respond_to? :params
15+
@view_context.respond_to? :view_context
16+
@view_context.params
17+
@view_context
18+
self.get_instance_variable(:view_context)
19+
self.instance_variables
20+
self
21+
@view_context.send(:params)
22+
@view_context
23+
self.params
24+
params
25+
self.class.superclass.superclass.superclass
26+
self.class.superclass.superclass
27+
self.class.superclass
28+
params
29+
self.class
30+
self
31+
params
32+
defined? params
33+
continue
34+
self
35+
continue
236
page.html
337
all(:link_or_button, 'See Success')
438
find(:link_or_button, 'See Success')
@@ -220,37 +254,3 @@ self.class.requires_properties
220254
continue
221255
Matestack::Ui::Core::Form::Form.instance_methods.include? :method
222256
Matestack::Ui::Core::Form::Form.instance_methods.contains? :method
223-
Matestack::Ui::Core::Form::Form.instance_methods
224-
Matestack::Ui::Core::Form::Form
225-
save_screenshot
226-
continue
227-
PropertyComponent.new(title: 'Test', foo: 'Foo').respond_to?(:title)
228-
PropertyComponent.new.respond_to?(:title)
229-
PropertyComponent.new.respond_to?(:title))
230-
continue
231-
self.class.requires_properties
232-
self.class.optional_properties
233-
continue
234-
self.class.optional_properties
235-
continue
236-
self.class.optional_properties
237-
self.class.requires_properties
238-
prop
239-
self.send(:options)[prop]
240-
self.send(:options)
241-
continue
242-
self
243-
self.class
244-
self.class.respond_to? :required_properties
245-
self.respond_to? :required_properties
246-
self.respond_to? :required_hooks
247-
self.respond_to? :puts
248-
self.responds_to? :puts
249-
self.defined?(:puts)
250-
self.defined(:puts=
251-
self.send(:singleton_method_undefined, :puts)
252-
self.send(:singleton_method_undefined)
253-
self.send(:singleton_method_defined?)
254-
self
255-
continue
256-
TestModel.destroy_all

app/concepts/matestack/ui/core/collection/helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ def set_collection id: nil, init_offset: 0, init_limit: nil, base_count: nil, fi
112112
# try to get params from either controller params, when called in a rails legacy view or
113113
# from cells context when called in a matestack app/page/component
114114
def controller_params
115-
return params.to_unsafe_h if defined? params
116115
return context[:params] if defined? context
116+
return params.to_unsafe_h if defined? params
117117
raise 'collection component is missing access to params or context'
118118
end
119119

spec/0.8/components/action_spec.rb

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
require_relative "../../support/utils"
2+
require_relative "../../support/test_controller"
23
include Utils
34

4-
class TestController < ActionController::Base
5-
before_action :check_params
6-
7-
def check_params
8-
expect_params(params.permit!.to_h)
9-
end
10-
11-
def expect_params(params)
12-
end
13-
end
14-
155
describe "Action Component", type: :feature, js: true do
166
before :each do
177
module Example

spec/0.8/components/dynamic/collection/pagination_spec.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ def destroy_test_model
155155
Rails.application.reload_routes!
156156

157157
class ExamplePage < Matestack::Ui::Page
158+
include Matestack::Ui::Core::HasViewContext
158159
include Matestack::Ui::Core::Collection::Helper
159160

160161
def prepare

spec/0.8/integrations/turbolinks_integration_spec.rb

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
1-
describe "Turbolinks integration", type: :feature, js: true do
2-
3-
class TestController < ActionController::Base
4-
5-
before_action :check_params
6-
7-
def check_params
8-
expect_params(params.permit!.to_h)
9-
end
10-
11-
def expect_params(params)
12-
end
1+
require_relative "../../support/test_controller"
132

14-
end
3+
describe "Turbolinks integration", type: :feature, js: true do
154

165
it "Matestack can be used with turbolinks" do
176

@@ -37,6 +26,9 @@ def response
3726
end
3827
end
3928

29+
module Pages
30+
end
31+
4032
module Pages::TurbolinksTest
4133
end
4234

@@ -77,10 +69,11 @@ def action_config
7769
end
7870
Rails.application.reload_routes!
7971

80-
class TurbolinksTestController < ActionController::Base
72+
class TurbolinksTestController < ApplicationController
73+
include Matestack::Ui::Core::ApplicationHelper
8174
layout "application_with_turbolinks"
75+
matestack_app Apps::TurbolinksTest
8276

83-
include Matestack::Ui::Core::ApplicationHelper
8477

8578
def page1
8679
render(Pages::TurbolinksTest::Page1)
@@ -106,7 +99,6 @@ def test
10699
visit "/turbolinks1"
107100

108101
expect(page).to have_text "Hello from matestack with turbolinks - Page 1"
109-
110102
click_button "Transition to Page 2"
111103

112104
expect(page).to have_text "Hello from matestack with turbolinks - Page 2"

0 commit comments

Comments
 (0)