You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by ru...@apache.org on 2017/08/19 21:43:51 UTC
[whimsy] branch master updated (1f13620 -> 89e8b27)
This is an automated email from the ASF dual-hosted git repository.
rubys pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git.
from 1f13620 update jquery
new bb054d5 ensure lockfile is updated by install process
new 89e8b27 update react version
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
www/board/agenda/Rakefile | 1 +
www/board/agenda/package.json | 3 ++-
www/board/agenda/spec/client_spec.rb | 2 +-
www/board/agenda/spec/filters_spec.rb | 15 +++++++++------
www/board/agenda/spec/forms_spec.rb | 32 +++++++++++++++++++-------------
www/board/agenda/spec/react_server.rb | 5 +++--
6 files changed, 35 insertions(+), 23 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].
[whimsy] 01/02: ensure lockfile is updated by install process
Posted by ru...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
commit bb054d528a2420c618d8a58a617f15c359a1f950
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Sat Aug 19 17:43:21 2017 -0400
ensure lockfile is updated by install process
---
www/board/agenda/Rakefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/www/board/agenda/Rakefile b/www/board/agenda/Rakefile
index 4dfc5bc..6cd910e 100644
--- a/www/board/agenda/Rakefile
+++ b/www/board/agenda/Rakefile
@@ -41,6 +41,7 @@ end
file 'package-lock.json' => 'package.json' do
sh 'npm install'
+ sh 'touch package-lock.json'
end
file 'test/work' do
--
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.
[whimsy] 02/02: update react version
Posted by ru...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
commit 89e8b27dc93e821a8e4618e20f37de59f7a1b1eb
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Sat Aug 19 17:43:42 2017 -0400
update react version
---
www/board/agenda/package.json | 3 ++-
www/board/agenda/spec/client_spec.rb | 2 +-
www/board/agenda/spec/filters_spec.rb | 15 +++++++++------
www/board/agenda/spec/forms_spec.rb | 32 +++++++++++++++++++-------------
www/board/agenda/spec/react_server.rb | 5 +++--
5 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/www/board/agenda/package.json b/www/board/agenda/package.json
index 8cdf49f..9646620 100644
--- a/www/board/agenda/package.json
+++ b/www/board/agenda/package.json
@@ -10,6 +10,7 @@
"devDependencies": {
"jsdom": "^5.4.3",
"jquery": "^3.2.1",
- "react": "^0.13.3"
+ "react": "^15.6.1",
+ "react-dom": "^15.6.1"
}
}
diff --git a/www/board/agenda/spec/client_spec.rb b/www/board/agenda/spec/client_spec.rb
index 895d00b..35e4b14 100644
--- a/www/board/agenda/spec/client_spec.rb
+++ b/www/board/agenda/spec/client_spec.rb
@@ -23,7 +23,7 @@ describe "client", type: :feature, server: :react do
_item.prev item.prev.href, class: item.href if item.prev
end
- response.end React.renderToStaticMarkup(output)
+ response.end ReactDOMServer.renderToStaticMarkup(output)
end
expect(page).not_to have_selector '.Call-to-order.prev'
diff --git a/www/board/agenda/spec/filters_spec.rb b/www/board/agenda/spec/filters_spec.rb
index f9159f1..6d97a80 100644
--- a/www/board/agenda/spec/filters_spec.rb
+++ b/www/board/agenda/spec/filters_spec.rb
@@ -14,8 +14,9 @@ describe "filters", type: :feature, server: :react do
@item = @parsed.find {|item| item['title'] == 'Clerezza'}
on_react_server do
- React.render _Report(item: Agenda.new(@item)), document.body do
- response.end document.body.innerHTML
+ container = document.createElement('div')
+ ReactDOM.render _Report(item: Agenda.new(@item)), container do
+ response.end container.innerHTML
end
end
@@ -31,8 +32,9 @@ describe "filters", type: :feature, server: :react do
@item = @parsed.find {|item| item['title'] == 'Call to order'}
on_react_server do
- React.render _Report(item: Agenda.new(@item)), document.body do
- response.end document.body.innerHTML
+ container = document.createElement('div')
+ ReactDOM.render _Report(item: Agenda.new(@item)), container do
+ response.end container.innerHTML
end
end
@@ -51,8 +53,9 @@ describe "filters", type: :feature, server: :react do
})
on_react_server do
- React.render _Report(item: Agenda.new(@item)), document.body do
- response.end document.body.innerHTML
+ container = document.createElement('div')
+ ReactDOM.render _Report(item: Agenda.new(@item)), container do
+ response.end container.innerHTML
end
end
diff --git a/www/board/agenda/spec/forms_spec.rb b/www/board/agenda/spec/forms_spec.rb
index 8fd509e..8783a7f 100644
--- a/www/board/agenda/spec/forms_spec.rb
+++ b/www/board/agenda/spec/forms_spec.rb
@@ -13,8 +13,9 @@ describe "forms", type: :feature, server: :react do
it "has an add-comment form with a disabled Save button" do
on_react_server do
server = {pending: {}, initials: 'sr'}
- React.render _AddComment(item: {}, server: server), document.body do
- response.end document.body.innerHTML
+ container = document.createElement('div')
+ ReactDOM.render _AddComment(item: {}, server: server), container do
+ response.end container.innerHTML
end
end
@@ -31,11 +32,12 @@ describe "forms", type: :feature, server: :react do
it "should enable Save button after input" do
on_react_server do
server = {pending: {}, initials: 'sr'}
- React.render _AddComment(item: {}, server: server), document.body do
- node = ~'#comment_text'
+ container = document.createElement('div')
+ ReactDOM.render _AddComment(item: {}, server: server), container do
+ node = container.querySelector('#comment-text')
node.textContent = 'Good job!'
Simulate.change node, target: {value: 'Good job!'}
- response.end document.body.innerHTML
+ response.end container.innerHTML
end
end
@@ -54,8 +56,9 @@ describe "forms", type: :feature, server: :react do
@item = parsed.find {|item| item['title'] == 'Executive Vice President'}
on_react_server do
item = Agenda.new(@item)
- React.render _Post(item: item, button: 'edit report'), document.body do
- response.end document.body.innerHTML
+ container = document.createElement('div')
+ ReactDOM.render _Post(item: item, button: 'edit report'), container do
+ response.end container.innerHTML
end
end
@@ -69,10 +72,12 @@ describe "forms", type: :feature, server: :react do
@item = parsed.find {|item| item['title'] == 'Executive Vice President'}
on_react_server do
item = Agenda.new(@item)
- React.render _Post(item: item, button: 'edit report'), document.body do
- Simulate.click ~'.btn-danger'
- ~'#post-report-text'.textContent = this.state.report
- response.end document.body.innerHTML
+ container = document.createElement('div')
+ ReactDOM.render _Post(item: item, button: 'edit report'), container do
+ Simulate.click container.querySelector('.btn-danger')
+ post_report = container.querySelector('#post-report-text')
+ post_report.textContent = this.state.report
+ response.end container.innerHTML
end
end
@@ -91,8 +96,9 @@ describe "forms", type: :feature, server: :react do
on_react_server do
Agenda.load(@parsed)
server = {pending: {approved: ['7'], comments: {I: 'Nice report!'}}}
- React.render _Commit(item: {}, server: server), document.body do
- response.end document.body.innerHTML
+ container = document.createElement('div')
+ ReactDOM.render _Commit(item: {}, server: server), container do
+ response.end container.innerHTML
end
end
diff --git a/www/board/agenda/spec/react_server.rb b/www/board/agenda/spec/react_server.rb
index 0da16b4..4b933b6 100644
--- a/www/board/agenda/spec/react_server.rb
+++ b/www/board/agenda/spec/react_server.rb
@@ -77,8 +77,9 @@ class ReactServer
global.navigator = global.window.navigator
React = require('react')
- ReactAddons = require('react/addons')
- TestUtils = React.addons.TestUtils
+ ReactDOM = require('react-dom')
+ ReactDOMServer = require('react-dom/server');
+ TestUtils = require('react-dom/test-utils')
Simulate = TestUtils.Simulate
jQuery = require('jquery')
--
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.