Skip to content

Commit

Permalink
replace mentions of dev.isrd.isi.edu with dev.derivacloud.org
Browse files Browse the repository at this point in the history
  • Loading branch information
RFSH committed Oct 12, 2023
1 parent 9bb67c1 commit 0db95d6
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 24 deletions.
6 changes: 3 additions & 3 deletions docs/dev-docs/e2e-test-writing.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ Setting it to `true` means that subsequent additions/injections to the the contr
Synchronization makes protractor wait for Angular promises to resolve and causes the url's to be scrambled. Chaise uses the `#` delimiter to determine url parameters to be sent to Ermrest. Thus, enabling synchronization, changes the url, appending an extra / after the `#` symbol.

Thus a correct url like this
`https://dev.isrd.isi.edu/chaise/record/#1/legacy:dataset/id=1580`
`https://exampel.com/chaise/record/#1/legacy:dataset/id=1580`

changes to

`https://dev.isrd.isi.edu/chaise/record/#/1/legacy:dataset/id=1580`
`https://exampel.com/chaise/record/#/1/legacy:dataset/id=1580`

Thus, the parser is unable to parse it. To avoid this we simply disable synchronization in the start of testcases.

Expand Down Expand Up @@ -90,7 +90,7 @@ chaisePage.waitForElement(element(by.id("some-id"), 5000).then(function() {
This can be useful when you want to wait for the URL to change in case of form submissions or link clicks.
```js
var url = "http://dev.isrd.isi.edu/chaise/search";
var url = "http://example.com/chaise/search";
chaisePage.waitForUrl(url, 5000).then(function() {
console.log("Redirected to url");
}, function(err) {
Expand Down
12 changes: 6 additions & 6 deletions docs/dev-docs/e2e-test.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ export REMOTE_CHAISE_DIR_PATH=USERNAME@HOST:public_html/chaise
These variables are used in our test framework to communicate with `ERMrest`. The following is how these variables most probably should look like:

```sh
export CHAISE_BASE_URL=https://dev.isrd.isi.edu/~<your-user-directory>chaise # No trailing `/`
export ERMREST_URL=https://dev.isrd.isi.edu/ermrest # No trailing `/`
export CHAISE_BASE_URL=https://dev.derivacloud.org/~<your-user-directory>chaise # No trailing `/`
export ERMREST_URL=https://dev.derivacloud.org/ermrest # No trailing `/`
export AUTH_COOKIE="webauthn=PutYourCookieHere;" # You have to put `webauthn=` at the beginging and `;` at the end.
export RESTRICTED_AUTH_COOKIE="webauthn=PutAnotherCookieHere;" # You have to put `webauthn=` at the beginging and `;` at the end.
export REMOTE_CHAISE_DIR_PATH=chirag@dev.isrd.isi.edu:public_html/chaise # No trailing `/`
export REMOTE_CHAISE_DIR_PATH=some_user_name@dev.derivacloud.org:public_html/chaise # No trailing `/`
export SHARDING=false
```

Expand All @@ -51,7 +51,7 @@ You can get your cookie by querying the database, or using the following simple

## How To Run Tests
### Prerequistes
1. After setting up the environment variables, make sure that the `https://dev.isrd.isi.edu/~<your-user-directory>` directory has the public access(if not, give the folder the following permissions `chmod 755 <your-user-directory>`).
1. After setting up the environment variables, make sure that the `https://dev.derivacloud.org/~<your-user-directory>` directory has the public access(if not, give the folder the following permissions `chmod 755 <your-user-directory>`).

2. Make sure all the dependencies are installed by running the following command:

Expand All @@ -71,7 +71,7 @@ You can get your cookie by querying the database, or using the following simple
```
As the name suggests this will not install dependencies. That's why you need to install all the dependencies in step 2.

4. Upload your code on the `https://dev.isrd.isi.edu/~<your-user-directory>` by the running the following command in your local chaise repository (This will upload your local code to the remote server):
4. Upload your code on the `https://dev.derivacloud.org/~<your-user-directory>` by the running the following command in your local chaise repository (This will upload your local code to the remote server):

```sh
make deploy
Expand Down Expand Up @@ -240,7 +240,7 @@ $ eval ssh-agent
$ ssh-add PATH/TO/KEY

# export REMOTE_CHAISE_DIR_PATH=USERNAME@HOST:public_html/chaise
$ export REMOTE_CHAISE_DIR_PATH=chirag@dev.isrd.isi.edu:public_html/chaise
$ export REMOTE_CHAISE_DIR_PATH=some_user_name@dev.derivacloud.org:public_html/chaise
```

**CI**: For CI there is no need to set `REMOTE_CHAISE_DIR_PATH` as it copies the actual file to the **chaise-config.js** in its local directory where it is running the test-suite.
Expand Down
12 changes: 4 additions & 8 deletions docs/dev-docs/manual-test.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,7 @@
### Auto placement of tooltips
- By default, the tooltips on column headers should appear on top-center
- For the rightmost column if the tooltip text(comment) is too long then the tooltip should be placed on top-right
[(Right-most-column-tooltip)](https://dev.isrd.isi.edu/~dsingh/wiki-images/right-most-column-tooltip.png)
- Similarly, for other columns too if the tooltip text is long and they appear on the left or right edge of the window then their tooltip should be placed on top-left or top-right respectively
([Default tooltip](https://dev.isrd.isi.edu/~dsingh/wiki-images/top-center-arrow.png),
[Long text on the leftmost column](https://dev.isrd.isi.edu/~dsingh/wiki-images/top-left-arrow.png),
[Long text on the rightmost column](https://dev.isrd.isi.edu/~dsingh/wiki-images/top-right-arrow.png))

- Make sure the tooltip does not flicker or overlap the header text if the text is too long.

Expand Down Expand Up @@ -103,7 +99,7 @@ This means that we will only update the "total count", if we got the updated dat

1. For testing this feature, make sure that you have `debug:true` in your `chaise-config.js` to be able to look at the logs that we generate (You can also use the `network` tab in browsers to look at the actual ermrest requests).

- If you're using chrome make sure that it's showing [verbose](https://dev.isrd.isi.edu/~ashafaei/wiki-images/verbose.png) logs.
- If you're using chrome make sure that it's showing all the logs, including the "verbose" ones. More information [here](https://developer.chrome.com/docs/devtools/console/log/#browser).

2. It's better if you throttle your network speed ([chrome](https://developers.google.com/web/tools/chrome-devtools/network-performance/network-conditions)/[firefox](https://blog.nightly.mozilla.org/2016/11/07/simulate-slow-connections-with-the-network-throttling-tool/)) to simulate slower networks and make the flow-control more visible.

Expand Down Expand Up @@ -132,16 +128,16 @@ In [ErmrestDataUtils](https://github.com/informatics-isi-edu/ErmrestDataUtils),
## Test priviledges
- Verify that files uploaded by another user that you don't have permission to read, will properly create a new version of that file in hatrac.
1. Need to have 2 user accounts. One cannot be a part of any of the globus groups that we rely on to set blanket permissions (`isrd-staff`, `isrd-testers`).
- `curl -H 'cookie: webauthn=<admin-cookie-here>' -X PUT -H "Content-Type: application/json" -d '[<user-2-globus-id>]' -i "https://dev.isrd.isi.edu/hatrac/js;acl/subtree-create"`
- `curl -H 'cookie: webauthn=<admin-cookie-here>' -X PUT -H "Content-Type: application/json" -d '[<user-2-globus-id>]' -i "https://dev.derivacloud.org/hatrac/js;acl/subtree-create"`
2. User 1 creates file1 in hatrac
3. user 2 doesn't have permission to update that object in hatrac
4. user 2 tries to upload the same exact file to the same namespace in hatrac
- should get 403
5. change permissions on hatrac obj to include update for user 2
- `curl -H 'cookie: webauthn=<admin-cookie-here>' -X PUT -H "Content-Type: application/json" -d '[<user-2-globus-id>]' -i "https://dev.isrd.isi.edu/hatrac/js/chaise/<timestamp_txt-value>/<id-value>/<object-id>;acl/update"`
- `curl -H 'cookie: webauthn=<admin-cookie-here>' -X PUT -H "Content-Type: application/json" -d '[<user-2-globus-id>]' -i "https://dev.derivacloud.org/hatrac/js/chaise/<timestamp_txt-value>/<id-value>/<object-id>;acl/update"`
6. user 2 tries to upload same exact file to the same namespace again
7. navigate to hatrac folder and verify a new version was created
- ssh to `dev.isrd.isi.edu`
- ssh to `dev.derivacloud.org`
- `cd /var/www/hatrac/js/chaise/<timestamp_txt-value>/<id-value>/`
- `ls -al` to list all contents and file sizes

Expand Down
6 changes: 3 additions & 3 deletions docs/user-docs/logging-pre-feb-20.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
By providing `Deriva-Client-Context` header in ermrset requests we can log extra objects alongside the request. ERMrest will log the provided object in the `dcctx` attribute of logs. For example the following is a line from `/var/log/messages` file in dev.isrd:

```
Jan 24 16:29:50 dev.isrd.isi.edu ermrest[4313.139635548755712]:
Jan 24 16:29:50 dev.derivacloud.org ermrest[4313.139635548755712]:
{
"elapsed":0.014,
"req":"OSGHMz7JSySiS0Y5UOLA6w",
"scheme":"https",
"host":"dev.isrd.isi.edu",
"host":"dev.derivacloud.org",
"status":"304 Not Modified",
"method":"GET",
"path":"/ermrest/catalog/1/attributegroup/M:=isa:dataset/F5:=left(thumbnail)=(isa:file:id)/$M/F4:=left(owner)=(isa:person:name)/$M/F3:=left(gene_summary)=(vocabulary:gene_summary:id)/$M/F2:=left(status)=(isa:dataset_status:id)/$M/F1:=left(project)=(isa:project:id)/$M/release_date,id;M:=array(M:*),F5:=array(F5:*),F4:=array(F4:*),F3:=array(F3:*),F2:=array(F2:*),F1:=array(F1:*)@sort(release_date::desc::,id)?limit=26", "client":"128.9.184.94",
"referrer":"https://dev.isrd.isi.edu/~ashafaei/chaise/recordset/",
"referrer":"https://dev.derivacloud.org/chaise/recordset/",
"agent":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36",
"track":"f671a1bf.559966234faaf",
"dcctx":{
Expand Down
4 changes: 2 additions & 2 deletions docs/user-docs/logging.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ By providing `Deriva-Client-Context` header in ermrset requests we can log extra
"elapsed": 0.037084000000000006,
"req": "Le-1bpTwSfSxddRT8Y0T5g",
"scheme": "https",
"host": "dev.isrd.isi.edu",
"host": "dev.derivacloud.org",
"status": "200 OK",
"method": "GET",
"path": "/ermrest/catalog/1/entity/T:=isa:dataset/(id)=(isa:dataset_organism:dataset_id)/M:=(organism)=(vocab:species:id)@sort(name,RID)?limit=11",
"type": "application/json",
"client": "128.9.180.218",
"referrer": "https://dev.isrd.isi.edu/chaise/recordset/",
"referrer": "https://dev.derivacloud.org/chaise/recordset/",
"agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.212 Safari/537.36",
"track": "916d434.5aa5c5cf6b595",
"dcctx": {
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/data_setup/schema/recordset/saved-query.json
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@
"title_pattern": "{{lgt}}",
"journal_pattern": "Journal of Front End Faceting Test Data",
"year_pattern": "{{formatDate RCT 'YYYY'}}",
"url_pattern": "https://dev.isrd.isi.edu/chaise/record/#{{$catalog.snapshot}}/faceting:main/RID={{RID}}"
"url_pattern": "{{$location.origin}}/chaise/record/#{{$catalog.snapshot}}/faceting:main/RID={{RID}}"
},
"tag:misd.isi.edu,2015:display": {
"show_saved_query": true
Expand Down Expand Up @@ -906,7 +906,7 @@
}
],
"foreign_keys": [

],
"kind": "table",
"annotations": {
Expand Down

0 comments on commit 0db95d6

Please sign in to comment.